ENH: Fix GenerateCLP install rules. See Slicer#44

* Introduce GenerateCLP_INSTALL_CMAKE_DIR variable allowing to
configure install location for "GenerateCLP.cmake" macro.

* GenerateCLP_INSTALL_NO_DEVELOPMENT: Change default value from ON to
OFF. This will ensure GenerateCLP macro and dependent files are installed
by default.

* GenerateCLPLauncher:

 - Update hardcoded location of ITK libraries. It was changed from "bin"
 to "lib" in ITKv4.

 - Update forward install dir to account for that fact both GenerateCLP
 and launcher are installed in the same directory.

* Ensure following files are installed:
 - UseGenerateCLP.cmake
 - GenerateCLPConfig.cmake
 - GenerateCLP.cmake

Co-authored-by: Nicole Aucoin <[email protected]>

Author: jcfr

GenerateCLP/CMakeLists.txt

@@ -74,6 +74,14 @@ endif()
 #-----------------------------------------------------------------------------
 include(CTest)
 
+#-----------------------------------------------------------------------------
+# Install tree directories
+#-----------------------------------------------------------------------------
+
+if(NOT DEFINED GenerateCLP_INSTALL_CMAKE_DIR)
+  set(GenerateCLP_INSTALL_CMAKE_DIR lib/GenerateCLP)
+endif()
+
 #-----------------------------------------------------------------------------
 # Output directories.
 #-----------------------------------------------------------------------------
@@ -133,27 +141,12 @@ if(NOT DEFINED GenerateCLP_INSTALL_BIN_DIR)
   set(GenerateCLP_INSTALL_BIN_DIR bin)
 endif()
 if(NOT DEFINED ${PROJECT_NAME}_INSTALL_NO_DEVELOPMENT)
-  set(${PROJECT_NAME}_INSTALL_NO_DEVELOPMENT ON)
+  set(${PROJECT_NAME}_INSTALL_NO_DEVELOPMENT OFF)
 endif()
 if(NOT ${PROJECT_NAME}_INSTALL_NO_DEVELOPMENT)
-  install(TARGETS GenerateCLP RUNTIME
-    DESTINATION ${GenerateCLP_INSTALL_BIN_DIR} COMPONENT Development
-    )
-endif()
-
-# --------------------------------------------------------------------------
-# Install support files
-# --------------------------------------------------------------------------
-if(NOT ${PROJECT_NAME}_INSTALL_NO_DEVELOPMENT)
-  install(FILES ${GenerateCLP_BINARY_DIR}/GenerateCLPConfig.cmake_install
-    DESTINATION lib/GenerateCLP
-    COMPONENT Development
-    RENAME GenerateCLPConfig.cmake
-    )
-  install(FILES ${GenerateCLP_BINARY_DIR}/UseGenerateCLP.cmake_install
-    DESTINATION lib/GenerateCLP
+  install(TARGETS GenerateCLP
+    RUNTIME DESTINATION ${GenerateCLP_INSTALL_BIN_DIR}
     COMPONENT Development
-    RENAME UseGenerateCLP.cmake
     )
 endif()
 
@@ -173,11 +166,11 @@ set(GenerateCLP_FORWARD_PATH_BUILD " \\
 ")
 set(GenerateCLP_FORWARD_PATH_INSTALL " \\
    \".\", \\
-   \"${ITK_DIR}/bin\", \\
+   \"${ITK_DIR}/lib\", \\
    \"${ModuleDescriptionParser_DIR}/bin\" \\
 ")
 set(GenerateCLP_FORWARD_EXE GenerateCLP)
-set(GenerateCLP_FORWARD_DIR_INSTALL "..")
+set(GenerateCLP_FORWARD_DIR_INSTALL ".")
 
 # --------------------------------------------------------------------------
 # Build launcher
@@ -222,6 +215,34 @@ configure_file(
   )
 include(GenerateGenerateCLPConfig.cmake)
 
+# --------------------------------------------------------------------------
+# Install support files
+# --------------------------------------------------------------------------
+if(NOT ${PROJECT_NAME}_INSTALL_NO_DEVELOPMENT)
+
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GenerateCLP.cmake
+    DESTINATION ${GenerateCLP_INSTALL_CMAKE_DIR}
+    COMPONENT Development
+    )
+
+  configure_file(
+    GenerateCLPInstallConfig.cmake.in
+    ${GenerateCLP_BINARY_DIR}/GenerateCLPConfig.cmake_install
+    @ONLY
+    )
+  install(FILES ${GenerateCLP_BINARY_DIR}/GenerateCLPConfig.cmake_install
+    DESTINATION lib/GenerateCLP
+    COMPONENT Development
+    RENAME GenerateCLPConfig.cmake
+    )
+
+  install(FILES ${GenerateCLP_SOURCE_DIR}/UseGenerateCLP.cmake.in
+    DESTINATION lib/GenerateCLP
+    COMPONENT Development
+    RENAME UseGenerateCLP.cmake
+    )
+endif()
+
 # --------------------------------------------------------------------------
 # Testing
 # --------------------------------------------------------------------------

GenerateCLP/GenerateCLPInstallConfig.cmake.in

@@ -9,6 +9,7 @@ endif(WIN32)
 
 set(GenerateCLP_INCLUDE_DIRS "${GenerateCLP_CONFIG_DIR}/../../include/GenerateCLP")
 set(GenerateCLP_LIBRARY_DIRS "${GenerateCLP_CONFIG_DIR}")
+set(GenerateCLP_CMAKE_DIR "${GenerateCLP_CONFIG_DIR}")
 set(GenerateCLP_USE_FILE "${GenerateCLP_CONFIG_DIR}/UseGenerateCLP.cmake")
 set(GENERATECLP_EXE "${GenerateCLP_CONFIG_DIR}/../../bin/GenerateCLP")
 if(NOT WIN32)