Bladeren bron

Always process a <library>/Documentation/CMakeLists.txt file if it exists.

This ensures that special CMake code for documentation purposes is
executed, independent of the value of the build option for a library.
Sascha Zelzer 12 jaren geleden
bovenliggende
commit
bbcd631862

+ 5 - 1
CMakeLists.txt

@@ -872,9 +872,13 @@ add_subdirectory(Libs/Testing)
 # Add CTK library subdirectories
 #
 foreach(lib ${CTK_LIBS})
-  IF (CTK_LIB_${lib})
+  if(CTK_LIB_${lib})
     add_subdirectory(Libs/${lib})
   endif()
+  # Always add the Documentation sub-directory for additional processing
+  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Libs/${lib}/Documentation/CMakeLists.txt)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Libs/${lib}/Documentation)
+  endif()
 endforeach()
 
 # Add the CommandLineModules root directory for additional processing

+ 0 - 8
Libs/CommandLineModules/Backend/LocalProcess/CMakeLists.txt

@@ -60,14 +60,6 @@ if(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
     )
 endif()
 
-find_package(Doxygen)
-if(DOXYGEN_FOUND)
-  # Copy XML schema file to the Doxygen output directory
-  add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/Resources/ctkCmdLineModuleProcess.xsd
-                                                  ${CTK_BINARY_DIR}/Documentation/html/ctkCmdLineModuleProcess.xsd)
-endif()
-
 # Testing
 if(BUILD_TESTING)
   #add_subdirectory(Testing)

+ 5 - 0
Libs/CommandLineModules/Backend/LocalProcess/Documentation/CMakeLists.txt

@@ -0,0 +1,5 @@
+
+# Copy XML schema file to the Doxygen output directory
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/../Resources/ctkCmdLineModuleProcess.xsd
+                                                              ${CTK_BINARY_DIR}/Documentation/html/ctkCmdLineModuleProcess.xsd)
+

+ 2 - 6
Libs/CommandLineModules/CMakeLists.txt

@@ -1,11 +1,7 @@
 
-find_package(Doxygen)
-
-if(DOXYGEN_FOUND)
-  add_subdirectory(Documentation)
-endif()
-
 if(BUILD_TESTING AND
     CTK_LIB_CommandLineModules/Core AND CTK_LIB_CommandLineModules/Backend/LocalProcess)
   add_subdirectory(Testing)
 endif()
+
+add_subdirectory(Documentation)

+ 0 - 8
Libs/CommandLineModules/Core/CMakeLists.txt

@@ -104,14 +104,6 @@ if(CTK_WRAP_PYTHONQT_FULL OR CTK_WRAP_PYTHONQT_LIGHT)
     )
 endif()
 
-find_package(Doxygen)
-if(DOXYGEN_FOUND)
-  # Copy XML schema file to the Doxygen output directory
-  add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/Resources/ctkCmdLineModule.xsd
-                                                  ${CTK_BINARY_DIR}/Documentation/html/ctkCmdLineModule.xsd)
-endif()
-
 # Testing
 if(BUILD_TESTING)
   add_subdirectory(Testing)

+ 5 - 0
Libs/CommandLineModules/Core/Documentation/CMakeLists.txt

@@ -0,0 +1,5 @@
+
+# Copy XML schema file to the Doxygen output directory
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/../Resources/ctkCmdLineModule.xsd
+                                                              ${CTK_BINARY_DIR}/Documentation/html/ctkCmdLineModule.xsd)
+