ver 3.3 (#5)

Arniiiii · web-flow · commit ee833270a727 · 2024-08-30T20:29:23.000Z
ver 3.3

Fixed when multiple invocations of addboost happened a lot of behaviour problems.

    drawback : using my version of CPM

commit log:
* fixed if `addboost` is called twice

* use my version of CPM.

* use Boost_LOCAL from my version of CPM

.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,15 +5,16 @@ cmake_minimum_required(VERSION 3.14...3.22)
 # Note: update this to your new project's name and version
 project(
   AddBoost.cmake
-  VERSION 3.2
+  VERSION 3.3
   LANGUAGES CXX
 )
 
 function(SUBDIRLIST result_var curdir)
   file(
     GLOB children
     RELATIVE ${curdir}
-    ${curdir}/*)
+    ${curdir}/*
+  )
   set(result "")
   foreach(child ${children})
     if(IS_DIRECTORY ${curdir}/${child})
@@ -22,18 +23,21 @@ function(SUBDIRLIST result_var curdir)
   endforeach()
   set(${result_var}
       ${result}
-      PARENT_SCOPE)
+      PARENT_SCOPE
+  )
 endfunction()
 
 macro(add_boost TRY_BOOST_VERSION BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED
-      BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED)
+      BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED
+)
   message(
     DEBUG
     "add_boost called with next arguments:
     \$\{\$\{TRY_BOOST_VERSION\}\} : ${${TRY_BOOST_VERSION}}
     \$\{\$\{BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED\}\} : ${${BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}}
     \$\{\$\{BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED\}\} : ${${BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}}
-  ")
+  "
+  )
   set(targets_to_link_to "${ARGN}")
   message(DEBUG "targets_to_link_to: \"${targets_to_link_to}\"")
   set(BOOST_INCLUDE_LIBRARIES
@@ -56,11 +60,13 @@ macro(add_boost TRY_BOOST_VERSION BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED
   set(patches_for_boost "")
 
   file(GLOB global_patches_for_boost CONFIGURE_DEPENDS
-       "${CMAKE_CURRENT_SOURCE_DIR}/patches/boost/*.patch")
+       "${CMAKE_CURRENT_SOURCE_DIR}/patches/boost/*.patch"
+  )
   list(APPEND patches_for_boost ${global_patches_for_boost})
   if(DEFINED BOOST_ADD_MY_PATCHES)
     file(GLOB global_patches_for_boost CONFIGURE_DEPENDS
-         "${BOOST_ADD_MY_PATCHES}/patches/boost/*.patch")
+         "${BOOST_ADD_MY_PATCHES}/patches/boost/*.patch"
+    )
     list(APPEND patches_for_boost ${global_patches_for_boost})
 
   endif()
@@ -69,11 +75,10 @@ macro(add_boost TRY_BOOST_VERSION BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED
   if(subdirs_boost_patches)
     foreach(subdir ${subdirs_boost_patches})
       if(${subdir} STREQUAL ${${TRY_BOOST_VERSION}})
-        file(GLOB_RECURSE patches_with_max_applicable_version_up_to
-             CONFIGURE_DEPENDS
-             "${CMAKE_CURRENT_SOURCE_DIR}/patches/boost/${subdir}/*.patch")
-        list(APPEND patches_for_boost
-             ${patches_with_max_applicable_version_up_to})
+        file(GLOB_RECURSE patches_with_max_applicable_version_up_to CONFIGURE_DEPENDS
+             "${CMAKE_CURRENT_SOURCE_DIR}/patches/boost/${subdir}/*.patch"
+        )
+        list(APPEND patches_for_boost ${patches_with_max_applicable_version_up_to})
       endif()
     endforeach()
   endif()
@@ -82,80 +87,56 @@ macro(add_boost TRY_BOOST_VERSION BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED
     if(subdirs_boost_patches)
       foreach(subdir ${subdirs_boost_patches})
         if(${subdir} STREQUAL ${${TRY_BOOST_VERSION}})
-          file(GLOB_RECURSE patches_with_max_applicable_version_up_to
-               CONFIGURE_DEPENDS
-               "${CMAKE_CURRENT_SOURCE_DIR}/patches/boost/${subdir}/*.patch")
-          list(APPEND patches_for_boost
-               ${patches_with_max_applicable_version_up_to})
+          file(GLOB_RECURSE patches_with_max_applicable_version_up_to CONFIGURE_DEPENDS
+               "${CMAKE_CURRENT_SOURCE_DIR}/patches/boost/${subdir}/*.patch"
+          )
+          list(APPEND patches_for_boost ${patches_with_max_applicable_version_up_to})
         endif()
       endforeach()
     endif()
   endif()
 
-  string(REPLACE ";" "\;"
-                 ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED
-                 "${${BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}}")
+  string(REPLACE ";" "\;" ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED
+                 "${${BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}}"
+  )
   message(
     DEBUG
     "\$\{ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED\} : ${ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}"
   )
 
   if(DEFINED BOOST_USE_MY_BOOST_DIRECTORY)
-    cpmaddpackage(
-      NAME
-      Boost
-      VERSION
-      ${${TRY_BOOST_VERSION}}
-      SOURCE_DIR
-      ${BOOST_USE_MY_BOOST_DIRECTORY}
-      PATCHES
-      ${patches_for_boost}
-      FIND_PACKAGE_ARGUMENTS
-      "COMPONENTS ${ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}"
-      OPTIONS
-      "BOOST_ENABLE_CMAKE ON;BOOST_SKIP_INSTALL_RULES OFF;${BOOST_MY_OPTIONS}")
+    CPMAddPackage(
+      NAME Boost
+      VERSION ${${TRY_BOOST_VERSION}}
+      SOURCE_DIR ${BOOST_USE_MY_BOOST_DIRECTORY} PATCHES ${patches_for_boost}
+      FIND_PACKAGE_ARGUMENTS "COMPONENTS ${ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}"
+      OPTIONS "BOOST_ENABLE_CMAKE ON;BOOST_SKIP_INSTALL_RULES OFF;${BOOST_MY_OPTIONS}"
+    )
   elseif(patches_for_boost AND NOT boost_is_old) # is it 1.80.0 < x < 1.84.0
-    cpmaddpackage(
-      NAME
-      Boost
-      VERSION
-      ${${TRY_BOOST_VERSION}}
-      URL
-      ${BOOST_URL}
-      PATCHES
-      ${patches_for_boost}
-      FIND_PACKAGE_ARGUMENTS
-      "COMPONENTS ${ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}"
-      OPTIONS
-      "BOOST_ENABLE_CMAKE ON;BOOST_SKIP_INSTALL_RULES OFF;${BOOST_MY_OPTIONS}")
+    CPMAddPackage(
+      NAME Boost
+      VERSION ${${TRY_BOOST_VERSION}}
+      URL ${BOOST_URL} PATCHES ${patches_for_boost}
+      FIND_PACKAGE_ARGUMENTS "COMPONENTS ${ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}"
+      OPTIONS "BOOST_ENABLE_CMAKE ON;BOOST_SKIP_INSTALL_RULES OFF;${BOOST_MY_OPTIONS}"
+    )
   elseif(NOT boost_is_old) # is it 1.85.0+ ?
-    cpmaddpackage(
-      NAME
-      Boost
-      VERSION
-      ${${TRY_BOOST_VERSION}}
-      URL
-      ${BOOST_URL}
-      FIND_PACKAGE_ARGUMENTS
-      "COMPONENTS ${ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}"
-      OPTIONS
-      "BOOST_ENABLE_CMAKE ON;BOOST_SKIP_INSTALL_RULES OFF;${BOOST_MY_OPTIONS}")
+    CPMAddPackage(
+      NAME Boost
+      VERSION ${${TRY_BOOST_VERSION}}
+      URL ${BOOST_URL}
+      FIND_PACKAGE_ARGUMENTS "COMPONENTS ${ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}"
+      OPTIONS "BOOST_ENABLE_CMAKE ON;BOOST_SKIP_INSTALL_RULES OFF;${BOOST_MY_OPTIONS}"
+    )
   else() # is it <1.80.0 ?
-    cpmaddpackage(
-      NAME
-      Boost
-      VERSION
-      ${${TRY_BOOST_VERSION}}
-      GIT_REPOSITORY
-      "https://github.com/boostorg/boost"
-      GIT_TAG
-      "boost-${${TRY_BOOST_VERSION}}"
-      PATCHES
-      ${patches_for_boost}
-      FIND_PACKAGE_ARGUMENTS
-      "COMPONENTS ${ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}"
-      OPTIONS
-      "BOOST_ENABLE_CMAKE ON;BOOST_SKIP_INSTALL_RULES OFF;${BOOST_MY_OPTIONS}")
+    CPMAddPackage(
+      NAME Boost
+      VERSION ${${TRY_BOOST_VERSION}}
+      GIT_REPOSITORY "https://github.com/boostorg/boost"
+      GIT_TAG "boost-${${TRY_BOOST_VERSION}}" PATCHES ${patches_for_boost}
+      FIND_PACKAGE_ARGUMENTS "COMPONENTS ${ESCAPED_BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}"
+      OPTIONS "BOOST_ENABLE_CMAKE ON;BOOST_SKIP_INSTALL_RULES OFF;${BOOST_MY_OPTIONS}"
+    )
   endif()
 
   # set(IS_BOOST_LOCAL OFF) endif()
@@ -164,7 +145,11 @@ macro(add_boost TRY_BOOST_VERSION BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED
 
   # Link dependencies
   foreach(target IN LISTS targets_to_link_to)
-    message(DEBUG "Boost_ADDED is defined : ${Boost_ADDED}")
+    if(DEFINED Boost_LOCAL)
+      message(DEBUG "Boost_LOCAL is defined \$\{Boost_LOCAL\}: ${Boost_LOCAL}")
+    else()
+      message(DEBUG "Boost_LOCAL is not defined.")
+    endif()
     if(NOT DEFINED ADDBOOSTCMAKE_LINK_TYPE)
       get_target_property(type ${target} TYPE)
       if("${type}" STREQUAL "INTERFACE_LIBRARY")
@@ -175,21 +160,19 @@ macro(add_boost TRY_BOOST_VERSION BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED
     else()
       set(ADDBOOSTCMAKE_LINK_TYPE_VALUE ${ADDBOOSTCMAKE_LINK_TYPE})
     endif()
-    if(Boost_ADDED STREQUAL "")
+    if(Boost_LOCAL STREQUAL "YES")
       target_link_libraries(${target} ${ADDBOOSTCMAKE_LINK_TYPE_VALUE} Boost::boost)
     else()
       foreach(a_lib ${${BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}})
-        target_link_libraries(${target} ${ADDBOOSTCMAKE_LINK_TYPE_VALUE}
-                              Boost::${a_lib})
+        target_link_libraries(${target} ${ADDBOOSTCMAKE_LINK_TYPE_VALUE} Boost::${a_lib})
       endforeach()
     endif()
 
     foreach(a_lib ${${BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}})
-      target_link_libraries(${target} ${ADDBOOSTCMAKE_LINK_TYPE_VALUE}
-                            Boost::${a_lib})
+      target_link_libraries(${target} ${ADDBOOSTCMAKE_LINK_TYPE_VALUE} Boost::${a_lib})
     endforeach()
   endforeach()
-  if(Boost_ADDED STREQUAL "")
+  if(Boost_LOCAL STREQUAL "YES")
     set(ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS
         "Boost ${${TRY_BOOST_VERSION}} REQUIRED ${${BOOST_NOT_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED}}"
     )
@@ -200,16 +183,19 @@ macro(add_boost TRY_BOOST_VERSION BOOST_HEADER_ONLY_COMPONENTS_THAT_YOU_NEED
     )
     foreach(dep ${BOOST_ALL_DEPENDENCIES})
       string(APPEND ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS
-             "boost_${dep} ${${TRY_BOOST_VERSION}};")
+             "boost_${dep} ${${TRY_BOOST_VERSION}};"
+      )
     endforeach()
     string(LENGTH "${ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS}"
-                  ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS_LENGTH)
+                  ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS_LENGTH
+    )
     math(EXPR ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS_LENGTH
-         "${ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS_LENGTH}-1"
-         OUTPUT_FORMAT DECIMAL)
+         "${ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS_LENGTH}-1" OUTPUT_FORMAT DECIMAL
+    )
     string(SUBSTRING "${ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS}" 0
                      ${ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS_LENGTH}
-                     ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS)
+                     ADDBOOSTCMAKE_PACKAGEPROJECT_INSTALL_TARGETS
+    )
   endif()
 
   message(
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Versions tested: from 1.79.0 upto 1.86.0 .
 ```cmake
 CPMAddPackage(
   NAME AddBoost.CMake
-  GIT_TAG 3.1
+  GIT_TAG 3.3
   GITHUB_REPOSITORY Arniiiii/AddBoost.cmake
 )
 ```
diff --git a/cmake/getCPM.cmake b/cmake/getCPM.cmake
@@ -1,9 +1,7 @@
 # ===============================================================================
 
-# This file should be like getCPM.cmake from CPM project. Though, because there's a logical error at
-# finding local boost ( if error, not much explanation why ) there's a problem that is going to be
-# fixed in PR https://github.com/cpm-cmake/CPM.cmake/pull/589 , here is just CPM.cmake file from the
-# project with a patch from this PR.
+# This file should be like getCPM.cmake from CPM project. But it's too long to wait until a PR is
+# merged. So we use here a my version.
 
 # =============================================================================
 # from release
@@ -30,13 +28,12 @@
 # include(${CPM_DOWNLOAD_LOCATION})
 #
 
-
 # =============================================================================
 # my version:
 # =============================================================================
 
-# set(CPM_DOWNLOAD_VERSION 0.40.2)
-# set(CPM_HASH_SUM "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d")
+# set(CPM_DOWNLOAD_VERSION 0.40.2) set(CPM_HASH_SUM
+# "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d")
 
 if(CPM_SOURCE_CACHE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
@@ -49,8 +46,7 @@ endif()
 # Expand relative path. This is important if the provided path contains a tilde (~)
 get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)
 
-file(DOWNLOAD
-     https://raw.githubusercontent.com/Arniiiii/CPM.cmake/master/cmake/CPM.cmake
+file(DOWNLOAD https://raw.githubusercontent.com/Arniiiii/CPM.cmake/main/cmake/CPM.cmake
      ${CPM_DOWNLOAD_LOCATION} # EXPECTED_HASH SHA256=${CPM_HASH_SUM}
 )
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ Versions tested: from 1.79.0 upto 1.86.0 .`
`16`	`16`	```cmake
`17`	`17`	`CPMAddPackage(`
`18`	`18`	`NAME AddBoost.CMake`
`19`		`- GIT_TAG 3.1`
	`19`	`+ GIT_TAG 3.3`
`20`	`20`	`GITHUB_REPOSITORY Arniiiii/AddBoost.cmake`
`21`	`21`	`)`
`22`	`22`	```