diff options
| author | Sam Bingner <sam@bingner.com> | 2018-12-26 13:07:23 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2018-12-26 14:51:59 -1000 |
| commit | 59c3e0b998fd69532159d8dc416109cf50651482 (patch) | |
| tree | 2e58bef1273e4d3542c168980e4a2d793e170045 /CMake | |
| parent | ac0d26d4e39da16bdbf575637fd3d4b24a7fb4b8 (diff) | |
| parent | 2aa218273eb6009880e987f90d3e24b8efb04642 (diff) | |
Merge nitotv apt fixes into 1.4.81.4.8+nitotv
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/Documentation.cmake | 6 | ||||
| -rw-r--r-- | CMake/Misc.cmake | 20 |
2 files changed, 14 insertions, 12 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 6ad0b9479..72bd61f14 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) |