diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-24 21:26:53 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-08-24 21:26:53 +0200 |
| commit | df247efec654e512242e4f4f1b0212034f9e01fe (patch) | |
| tree | 25c02e16957f3aa613af30c140fd8e8a3d52fda6 /app/doc/CMakeLists.txt | |
| parent | d0b6a8a4ec298024f14f704f9e40a6f9d324ccf3 (diff) | |
| parent | a5ade52caa489cf0a713e0f02b764000d203140e (diff) | |
Merge branch 'release/debian/1%5.2.0Beta2.1-1' into masterHEADdebian/1%5.2.0Beta2.1-1master
Diffstat (limited to 'app/doc/CMakeLists.txt')
| -rw-r--r-- | app/doc/CMakeLists.txt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/app/doc/CMakeLists.txt b/app/doc/CMakeLists.txt index a01d7af..adc21b3 100644 --- a/app/doc/CMakeLists.txt +++ b/app/doc/CMakeLists.txt @@ -6,14 +6,12 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/hhc.cmake.in ${CMAKE_CURRENT_BINARY_D FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html) -GET_TARGET_PROPERTY(HALIBUT_COMMAND halibut LOCATION) - SET(HALIBUT_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/intro.but ${CMAKE_CURRENT_SOURCE_DIR}/addm.but ${CMAKE_CURRENT_SOURCE_DIR}/changem.but ${CMAKE_CURRENT_SOURCE_DIR}/drawm.but - ${CMAKE_CURRENT_SOURCE_DIR}/editm.but + ${CMAKE_CURRENT_SOURCE_DIR}/editm.but ${CMAKE_CURRENT_SOURCE_DIR}/filem.but ${CMAKE_CURRENT_SOURCE_DIR}/helpm.but ${CMAKE_CURRENT_SOURCE_DIR}/hotbar.but @@ -38,7 +36,7 @@ ADD_CUSTOM_TARGET(clean-html # If we're using the GTK back-end, just generate "vanilla" HTML help files for use with gtkhtml IF(XTRKCAD_USE_GTK) - IF (APPLE) + IF (APPLE) SET(HALIBUT_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/osxconf.but ${HALIBUT_SOURCES}) ELSE(APPLE) SET(HALIBUT_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/linconf.but ${HALIBUT_SOURCES}) @@ -49,7 +47,7 @@ IF(XTRKCAD_USE_GTK) DEPENDS halibut ${HALIBUT_SOURCES} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/clean-html.cmake - COMMAND ${HALIBUT_COMMAND} ${HALIBUT_SOURCES} + COMMAND halibut ${HALIBUT_SOURCES} ) ADD_CUSTOM_TARGET(help-html ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/html/index.html) @@ -106,7 +104,7 @@ ELSE(XTRKCAD_USE_GTK) COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/clean-html.cmake COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/png.d ${CMAKE_CURRENT_BINARY_DIR}/html/png.d COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/xtrkcad_win.css ${CMAKE_CURRENT_BINARY_DIR}/html - COMMAND ${HALIBUT_COMMAND} ${HALIBUT_SOURCES} + COMMAND halibut ${HALIBUT_SOURCES} COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/hhc.cmake ) @@ -118,4 +116,3 @@ ELSE(XTRKCAD_USE_GTK) ) ENDIF(XTRKCAD_USE_GTK) - |