Merge branch 'master' into update-tclap

Author: hjmjohnson

.circleci/config.yml

@@ -3,39 +3,6 @@ build-settings: &build-settings
 
 version: 2
 jobs:
-  itk-v4.8.0_use_system_libraries-off:
-    <<: *build-settings
-    docker:
-      - image: hjmjohnson/slicerexecutionmodel:${CIRCLE_JOB}
-    steps:
-      - checkout
-      - run:
-          command: ./test/Docker/test.sh ${CIRCLE_JOB}
-
-  # ITK v4.10.1
-  itk-v4.10.1_use_system_libraries-off:
-    <<: *build-settings
-    docker:
-      - image: hjmjohnson/slicerexecutionmodel:${CIRCLE_JOB}
-    steps:
-      - checkout
-      - run:
-          command: ./test/Docker/test.sh ${CIRCLE_JOB}
-      - run:
-          command: ./test/Docker/test-serializer.sh ${CIRCLE_JOB}
-
-  # ITK v4.13.0
-  itk-v4.13.0_use_system_libraries-off:
-    <<: *build-settings
-    docker:
-      - image: hjmjohnson/slicerexecutionmodel:${CIRCLE_JOB}
-    steps:
-      - checkout
-      - run:
-          command: ./test/Docker/test.sh ${CIRCLE_JOB}
-      - run:
-          command: ./test/Docker/test-serializer.sh ${CIRCLE_JOB}
-
 
   # ITK master
   itk-master_use_system_libraries-off:
@@ -53,7 +20,4 @@ workflows:
   version: 2
   build-test:
     jobs:
-      - itk-v4.8.0_use_system_libraries-off
-      - itk-v4.10.1_use_system_libraries-off
-      - itk-v4.13.0_use_system_libraries-off
       - itk-master_use_system_libraries-off

CMake/SEMMacroBuildCLI.cmake

@@ -259,6 +259,26 @@ macro(SEMMacroBuildCLI)
       COMPONENT RuntimeLibraries
       )
 
+    # Save current values if any
+    if(DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION)
+      set(_saved_CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION})
+    endif()
+    if(DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT)
+      set(_saved_CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT ${CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT})
+    endif()
+
+    set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${LOCAL_SEM_INSTALL_RUNTIME_DESTINATION})
+    set(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT "RuntimeLibraries")
+    include(InstallRequiredSystemLibraries)
+
+    # Restore values
+    if(DEFINED _saved_CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION)
+      set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ${_saved_CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION})
+    endif()
+    if(DEFINED _saved_CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT)
+      set(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT ${_saved_CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT})
+    endif()
+
   endif()
 
   # Folder

GenerateCLP/CMakeLists.txt

@@ -211,6 +211,11 @@ configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/GenerateCLPLauncher.c.in
   ${GenerateCLPLauncher_SOURCE}
   @ONLY)
+set(KWSYS_NAMESPACE itksys)
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/SharedForward.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/SharedForward.h
+  @ONLY)
 add_custom_command(TARGET GenerateCLP POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E touch ${GenerateCLPLauncher_SOURCE}
   COMMENT "Force GenerateCLPLauncher to rebuild after GenerateCLP was modified"