summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMake/Documentation.cmake6
-rw-r--r--CMake/Misc.cmake20
-rw-r--r--CMakeLists.txt9
-rw-r--r--apt-pkg/CMakeLists.txt2
4 files changed, 22 insertions, 15 deletions
diff --git a/CMake/Documentation.cmake b/CMake/Documentation.cmake
index f3bbfdc6b..e5735873b 100644
--- a/CMake/Documentation.cmake
+++ b/CMake/Documentation.cmake
@@ -34,6 +34,8 @@ find_path(DOCBOOK_XSL manpages/docbook.xsl
/usr/share/xml/docbook/xsl-stylesheets
# Fedora
/usr/share/sgml/docbook/xsl-stylesheets
+ #Brew
+ /usr/local/Cellar/docbook-xsl/1.79.1/docbook-xsl/
# Fink
${CMAKE_INSTALL_PREFIX}/share/xml/xsl/docbook-xsl
# FreeBSD
@@ -88,7 +90,7 @@ endfunction()
# Process one document
function(po4a_one stamp_out out full_document language deps)
- path_join(full_path "${CMAKE_CURRENT_SOURCE_DIR}" "${full_document}")
+ path_join(full_path "${CMAKE_CURRENT_SOURCE_DIR}" "${full_document}")
po4a_components(document _ section ext "${full_document}")
# Calculate target file name
@@ -266,7 +268,7 @@ function(add_docbook target)
foreach(document ${DOC_DOCUMENTS})
foreach(lang ${DOC_LINGUAS})
- po4a_one(po4a_stamp po4a_out ${document} "${lang}" "${DOC_DEPENDS}")
+ po4a_one(po4a_stamp po4a_out ${document} "${lang}" "${DOC_DEPENDS}")
xsltproc_one(STAMP_OUT xslt_stamp
STAMP ${po4a_stamp}
FULL_DOCUMENT ${po4a_out}
diff --git a/CMake/Misc.cmake b/CMake/Misc.cmake
index 82cb4da37..18b51841f 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 d97ff0111..1ff18eb83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,12 +13,15 @@ enable_testing()
option(WITH_DOC "Build documentation." ON)
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")
-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")
@@ -203,7 +206,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 25ed13ec3..3620b66e9 100644
--- a/apt-pkg/CMakeLists.txt
+++ b/apt-pkg/CMakeLists.txt
@@ -35,7 +35,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}