Merge pull request #39 from jcfr/update-sem-build-macro-to-support-target-folder

ENH: SEMMacroBuildCLI - Add possibility to associate FOLDER with CLI tar...

Author: jcfr

CMake/SEMMacroBuildCLI.cmake

@@ -15,6 +15,7 @@ macro(SEMMacroBuildCLI)
     )
   set(oneValueArgs
     NAME LOGO_HEADER
+    FOLDER
     CLI_XML_FILE
     CLI_LIBRARY_WRAPPER_CXX
     CLI_SHARED_LIBRARY_WRAPPER_CXX # Deprecated
@@ -216,5 +217,14 @@ macro(SEMMacroBuildCLI)
       )
   endif()
 
+  # Folder
+  if(NOT DEFINED LOCAL_SEM_FOLDER)
+    set(LOCAL_SEM_FOLDER "${SlicerExecutionModel_DEFAULT_CLI_TARGETS_FOLDER_PREFIX}${LOCAL_SEM_NAME}")
+  endif()
+  foreach(target ${cli_targets})
+    set_target_properties(${target} PROPERTIES FOLDER ${LOCAL_SEM_FOLDER})
+  endforeach()
+  set(${MODULE_NAME}_TARGETS_FOLDER ${LOCAL_SEM_FOLDER})
+
 endmacro()
 

CMakeLists.txt

@@ -120,6 +120,13 @@ if(NOT DEFINED SlicerExecutionModel_DEFAULT_CLI_LIBRARY_WRAPPER_CXX)
     ${CMAKE_CURRENT_SOURCE_DIR}/CMake/SEMCommandLineLibraryWrapper.cxx)
 endif()
 
+#-----------------------------------------------------------------------------
+# Define default "cli targets folder prefix" used by SEMMacroBuildCLI.cmake
+#-----------------------------------------------------------------------------
+if(NOT DEFINED SlicerExecutionModel_DEFAULT_CLI_TARGETS_FOLDER_PREFIX)
+  set(SlicerExecutionModel_DEFAULT_CLI_TARGETS_FOLDER_PREFIX "")
+endif()
+
 #-----------------------------------------------------------------------------
 # Testing
 #-----------------------------------------------------------------------------

GenerateSlicerExecutionModelConfig.cmake

@@ -35,6 +35,10 @@ set(SlicerExecutionModel_DEFAULT_CLI_INSTALL_ARCHIVE_DESTINATION_CONFIG
   ${SlicerExecutionModel_DEFAULT_CLI_INSTALL_ARCHIVE_DESTINATION}
   )
 
+set(SlicerExecutionModel_DEFAULT_CLI_TARGETS_FOLDER_PREFIX_CONFIG
+  ${SlicerExecutionModel_DEFAULT_CLI_TARGETS_FOLDER_PREFIX}
+  )
+
 set(SlicerExecutionModel_LIBRARY_DIRS_CONFIG
   ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
   ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}

SlicerExecutionModelConfig.cmake.in

@@ -111,6 +111,13 @@ if(NOT DEFINED SlicerExecutionModel_DEFAULT_CLI_LIBRARY_WRAPPER_CXX)
     )
 endif()
 
+# If not already defined, set default "cli targets folder prefix" used by SEMMacroBuildCLI.cmake
+if(NOT DEFINED SlicerExecutionModel_DEFAULT_CLI_TARGETS_FOLDER_PREFIX)
+  set(SlicerExecutionModel_DEFAULT_CLI_TARGETS_FOLDER_PREFIX
+    "@SlicerExecutionModel_DEFAULT_CLI_TARGETS_FOLDER_PREFIX_CONFIG@"
+    )
+endif()
+
 # The SlicerExecutionModel targets file.
 if(NOT TARGET GenerateCLP AND EXISTS "@SlicerExecutionModel_EXPORT_FILE@")
   include("@SlicerExecutionModel_EXPORT_FILE@")