Merge pull request #1809 from BDoignies/NoInstall

Option not to install targets

Author: dcoeurjo

CMakeLists.txt

@@ -37,7 +37,6 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/deps)
 set(DGtal_VERSION_MAJOR ${CMAKE_PROJECT_VERSION_MAJOR})
 set(DGtal_VERSION_MINOR ${CMAKE_PROJECT_VERSION_MINOR})
 set(DGtal_VERSION_PATCH ${CMAKE_PROJECT_VERSION_PATCH})
-set(DGTAL_VERSION ${CMAKE_PROJECT_VERSION})
 set(PROJECT_VERSION ${CMAKE_PROJECT_VERSION})
 set(VERSION ${CMAKE_PROJECT_VERSION})
 

ChangeLog.md

@@ -21,6 +21,7 @@
   - Version is now extracted from the `VERSION` file for CMake and Python builds (Bastien Doignies, [#1810](https://github.com/DGtal-team/DGtal/pull/1810))
   - Replacing the global compilation flags when `DGTAL_WARNINGS_AS_ERRORS` is set, with per target `target_compile_options` to avoid errors on Boost warnings (David Coeurjolly,  [#1793](https://github.com/DGtal-team/DGtal/pull/1793))
   - Fixing the `make install` command for boost (issue #1794) (Bastien Doignies, [#1793](https://github.com/DGtal-team/DGtal/pull/1793))
+  - Adding option not to install targets to avoid crashes when boost is fetched through multiple channels ([#1809](https://github.com/DGtal-team/DGtal/pull/1809))
   - Cleaning up the Github Actions reuses (Bastien Doignies, [#1793](https://github.com/DGtal-team/DGtal/pull/1793))
   - Add cache to github actions (Bastien Doignies, [#1805](https://github.com/DGtal-team/DGtal/pull/1805))
 

cmake/Common.cmake

@@ -2,7 +2,7 @@
 # -- Messages
 #------------------------------------------------------------------------------
 message(STATUS "-------------------------------------------------------------------------------")
-message(STATUS "DGtal Version ${PROJECT_VERSION}")
+message(STATUS "DGtal Version ${DGTAL_VERSION}")
 message(STATUS "-------------------------------------------------------------------------------" )
 message(STATUS "Source DIR is ${PROJECT_SOURCE_DIR}")
 message(STATUS "Binary/Build DIR is ${PROJECT_BINARY_DIR}")

cmake/Install.cmake

@@ -1,29 +1,47 @@
-#------------------------------------------------------------------------------
-# DGtal Configuration file for the install target
-#------------------------------------------------------------------------------
 include(CMakePackageConfigHelpers)
 set(DGTAL_INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/DGtal")
 
-install(TARGETS 
+# On system where boost is fetched through multiples sources, there can
+# be some confusion as to which version is linked. 
+# For some unknown reason, DGtal can be linked with targets not declared
+# within this project, thus not necessarly in the export set; causing 
+# CMake to issue an error.
+# We tried fixing this in multiples ways but none of them but no parameters
+# that can be passed to CMake worked. 
+# We therefore add a mecanism to disable install/export targets (note that
+# other file might be required) that resolves the problem, although this is quite ugly...
+option(DGTAL_ENABLE_TARGET_INSTALL "Enable DGtal file installation" ON)
+if (${DGTAL_ENABLE_TARGET_INSTALL})
+  #------------------------------------------------------------------------------
+  # DGtal Configuration file for the install target
+  #------------------------------------------------------------------------------
+  install(TARGETS 
     DGtal 
-      # Dependancies also built by the project
-      DGtal_STB DGTAL_LibBoard DGTAL_BoostAddons
-  EXPORT DGtalTargets
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
-
-# Export file locally also, so the DGtalConfig.cmake 
-# in the build/ directory can work 
-export(TARGETS 
+    # Dependancies also built by the project
+    DGtal_STB DGTAL_LibBoard DGTAL_BoostAddons
+    EXPORT DGtalTargets
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  )
+  # Export file locally also, so the DGtalConfig.cmake 
+  # in the build/ directory can work 
+  export(TARGETS 
     DGtal 
-      # Dependancies also built by the project
-      DGtal_STB DGTAL_LibBoard DGTAL_BoostAddons
-  NAMESPACE DGtal::
-  FILE DGtalTargets.cmake
-)
+    # Dependancies also built by the project
+    DGtal_STB DGTAL_LibBoard DGTAL_BoostAddons
+    NAMESPACE DGtal::
+    FILE DGtalTargets.cmake
+  )
+
+  install(EXPORT DGtalTargets
+    FILE DGtalTargets.cmake
+    NAMESPACE DGtal::
+    DESTINATION ${DGTAL_INSTALL_DESTINATION}
+  )
+endif()
+
 
 # Install headers 
 # Note : this also copies a few .cpp and CMakeLists but simplifies the code here
@@ -45,14 +63,6 @@ install(FILES
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/DGtal/topology/tables/
 )
 
-
-install(EXPORT DGtalTargets
-  FILE DGtalTargets.cmake
-  NAMESPACE DGtal::
-  DESTINATION ${DGTAL_INSTALL_DESTINATION}
-)
-
-
 #------------------------------------------------------------------------------
 # DGtalConfig.cmake variables
 #------------------------------------------------------------------------------
@@ -75,9 +85,10 @@ foreach(dep ${_dependencies_list})
   endif()
 endforeach()
 
+message("DGtal version = ${DGTAL_VERSION}")
 write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/DGtalConfigVersion.cmake"
-  VERSION "${version}"
+  VERSION "${DGTAL_VERSION}"
   COMPATIBILITY AnyNewerVersion
 )