From bdaae0cf10410d534d381ab7fced7fa02ff3f695 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Thu, 26 Dec 2019 14:38:09 -1000 Subject: Revert "Build system changes" This reverts commit f84454a0628916d0590e43f1057a422673a11c97. --- CMakeLists.txt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 11a30679e..beb259a6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,18 +10,15 @@ include_directories(${PROJECT_BINARY_DIR}/include) enable_testing() -option(WITH_DOC "Build documentation." ON) +option(WITH_DOC "Build documentation." OFF) option(USE_NLS "Localisation support." ON) -INCLUDE_DIRECTORIES(/usr/src/skel/usr/include) -LINK_DIRECTORIES(/usr/src/skel/usr/lib) - set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMake") # Add coverage target set(CMAKE_CXX_FLAGS_COVERAGE "-g -fprofile-arcs -ftest-coverage") -set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "-lgcov -lSystem") -set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "-lgcov -lSystem") +set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "-lgcov") +set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "-lgcov") # Work around bug in GNUInstallDirs if (EXISTS "/etc/debian_version") @@ -225,11 +222,6 @@ add_subdirectory(apt-private) add_subdirectory(apt-inst) add_subdirectory(cmdline) add_subdirectory(completions) - -if (WITH_DOC) -add_subdirectory(doc) -endif() - add_subdirectory(dselect) add_subdirectory(ftparchive) add_subdirectory(methods) -- cgit v1.2.3