Set lib dir to be top level if top level supports IDI's CMake depende…

…ncy system
IDI-Systems · Mar 11, 2024 · 2ccf07d · 2ccf07d
1 parent 8a93b02
commit 2ccf07d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/cmake/idi/functions/framework/idi_init.cmake b/cmake/idi/functions/framework/idi_init.cmake
@@ -120,9 +120,26 @@ macro(idi_init)
 
         idi_new_component()
 
+
+
+        if(NOT IDICMAKE_IS_SUBDIRECTORY)
+            set(IDICMAKE_TOP_LEVEL_CMAKE_DEPENDENCY_SUPPORT  1 CACHE BOOL "")
+            set(IDICMAKE_EXTERNAL_LIB_DIR "${CMAKE_CURRENT_LIST_DIR}/lib/first-party")
+            set(IDICMAKE_EXTERNAL_THIRD_PARTY_LIB_DIR "${CMAKE_CURRENT_LIST_DIR}/lib/third-party")
+        else()
+            if(NOT IDICMAKE_TOP_LEVEL_CMAKE_DEPENDENCY_SUPPORT)
+                message(STATUS "Top level project does not support the IDI CMake dependency structure, placing dependencies in local lib folder.")
+                set(IDICMAKE_EXTERNAL_LIB_DIR "${CMAKE_CURRENT_LIST_DIR}/lib/first-party")
+                set(IDICMAKE_EXTERNAL_THIRD_PARTY_LIB_DIR "${CMAKE_CURRENT_LIST_DIR}/lib/third-party")
+            else()
+            set(IDICMAKE_EXTERNAL_LIB_DIR "${CMAKE_SOURCE_DIR}/lib/first-party")
+            set(IDICMAKE_EXTERNAL_THIRD_PARTY_LIB_DIR "${CMAKE_SOURCE_DIR}/lib/third-party")
+            endif()
+        endif()
+
+
         # Define a nice short hand for 3rd party external library folders
-        set(IDICMAKE_EXTERNAL_LIB_DIR "${CMAKE_CURRENT_LIST_DIR}/lib/first-party")
-        set(IDICMAKE_EXTERNAL_THIRD_PARTY_LIB_DIR "${CMAKE_CURRENT_LIST_DIR}/lib/third-party")
+
 
         idi_add_third_party_dependency(Catch2 https://github.com/catchorg/Catch2.git v3.5.2)
 

diff --git a/cmake/idi/functions/idi_add_dependency.cmake b/cmake/idi/functions/idi_add_dependency.cmake
@@ -131,7 +131,7 @@ function(__idi_add_dependency IDI_DEP_NAME IDI_DEP_URL IDI_DEP_TAG IDI_DEP_THIRD
     set(IDI_DO_POPULATE false)
 
     if(IDI_DEP_THIRD_PARTY)
-        set(IDI_DEP_SOURCE_DIR "${CMAKE_SOURCE_DIR}/lib/third-party/${IDI_DEP_NAME}")
+        set(IDI_DEP_SOURCE_DIR "${IDICMAKE_EXTERNAL_THIRD_PARTY_LIB_DIR}/${IDI_DEP_NAME}")
         set(IDI_DEP_BINARY_DIR "${CMAKE_BINARY_DIR}/_deps/${IDI_DEP_NAME_LOWER}")
         if(EXISTS ${IDI_DEP_SOURCE_DIR} AND EXISTS "${IDI_DEP_SOURCE_DIR}/.git")
 
@@ -168,7 +168,7 @@ function(__idi_add_dependency IDI_DEP_NAME IDI_DEP_URL IDI_DEP_TAG IDI_DEP_THIRD
             set(IDI_DO_POPULATE true)
         endif()
     else()
-        set(IDI_DEP_SOURCE_DIR "${CMAKE_SOURCE_DIR}/lib/first-party/${IDI_DEP_NAME}")
+        set(IDI_DEP_SOURCE_DIR "${IDICMAKE_EXTERNAL_LIB_DIR}/${IDI_DEP_NAME}")
         set(IDI_DEP_BINARY_DIR "${CMAKE_BINARY_DIR}/_deps/${IDI_DEP_NAME_LOWER}")
         if(EXISTS ${IDI_DEP_SOURCE_DIR} AND EXISTS "${IDI_DEP_SOURCE_DIR}/.git")
 

diff --git a/lib/README.md b/lib/README.md
@@ -62,3 +62,8 @@ target_include_directories(asio SYSTEM INTERFACE ${IDICMAKE_EXTERNAL_THIRD_PARTY
 # Git Submodules
 
 Use git submodules as you would in any other project. Do not place them in the first or third party folders used with the CMake dependency system as they will be ignored and possibly not tracked correctly by git.
+
+
+# Migration Considerations
+
+If moving from a previous submodule system, it is best to make sure that you go from a top-down approach to migrating. Make sure the root project is updated to accept CMake dependencies, then update any dependencies that may also be using this system.