From f8293b36df6ba2ccc56334c4a4f2477275732577 Mon Sep 17 00:00:00 2001
From: Jaywalker <jwilliams@nsllc.com>
Date: Tue, 6 Feb 2018 17:47:38 -0600
Subject: Build system changes

---
 CMake/Misc.cmake       | 20 ++++++++++----------
 CMakeLists.txt         |  6 ++++--
 apt-pkg/CMakeLists.txt |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/CMake/Misc.cmake b/CMake/Misc.cmake
index 6ad0b9479..45a00ae0c 100644
--- a/CMake/Misc.cmake
+++ b/CMake/Misc.cmake
@@ -66,16 +66,16 @@ endfunction()
 
 # Generates a simple version script versioning everything with current SOVERSION
 function(add_version_script target)
-    get_target_property(soversion ${target} SOVERSION)
-    set(script "${CMAKE_CURRENT_BINARY_DIR}/${target}.versionscript")
-    string(REPLACE "-" "" name "${target}_${soversion}")
-    string(TOUPPER "${name}" name)
-    add_custom_command(OUTPUT "${script}"
-                       COMMAND echo "${name} {global: *; };" > "${script}"
-                       VERBATIM )
-    add_custom_target(${target}-versionscript DEPENDS "${script}")
-    target_link_libraries(${target} PRIVATE -Wl,-version-script="${script}")
-    add_dependencies(${target} ${target}-versionscript)
+    #get_target_property(soversion ${target} SOVERSION)
+    #set(script "${CMAKE_CURRENT_BINARY_DIR}/${target}.versionscript")
+    #string(REPLACE "-" "" name "${target}_${soversion}")
+    #string(TOUPPER "${name}" name)
+    #add_custom_command(OUTPUT "${script}"
+    #                   COMMAND echo "${name} {global: *; };" > "${script}"
+    #                   VERBATIM )
+    #add_custom_target(${target}-versionscript DEPENDS "${script}")
+    #target_link_libraries(${target} PRIVATE -Wl,-version-script="${script}")
+    #add_dependencies(${target} ${target}-versionscript)
 endfunction()
 
 function(path_join out path1 path2)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bdbd2206..4ff7728e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,8 +17,8 @@ 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")
-set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "-lgcov")
+set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "-lgcov -lSystem")
+set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "-lgcov -lSystem")
 
 # Work around bug in GNUInstallDirs
 if (EXISTS "/etc/debian_version")
@@ -232,7 +232,9 @@ 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)
diff --git a/apt-pkg/CMakeLists.txt b/apt-pkg/CMakeLists.txt
index ce73c6a34..318c6d798 100644
--- a/apt-pkg/CMakeLists.txt
+++ b/apt-pkg/CMakeLists.txt
@@ -37,7 +37,7 @@ file(GLOB_RECURSE headers "*.h")
 
 # Create a library using the C++ files
 add_library(apt-pkg SHARED ${library})
-add_dependencies(apt-pkg apt-pkg-versionscript)
+#add_dependencies(apt-pkg apt-pkg-versionscript)
 # Link the library and set the SONAME
 target_include_directories(apt-pkg
                            PRIVATE ${ZLIB_INCLUDE_DIRS}
-- 
cgit v1.2.3