debug6

seqan · Jul 2, 2024 · dca8fc1 · dca8fc1
1 parent 77204e4
commit dca8fc1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/util/applications/src/CMakeLists.txt b/util/applications/src/CMakeLists.txt
@@ -14,8 +14,9 @@ set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
-get_filename_component (RAPTOR_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE)
-add_subdirectory ("${RAPTOR_ROOT_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/raptor")
+get_filename_component (Raptor_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE)
+include ("${Raptor_SOURCE_DIR}/cmake/configuration.cmake")
+add_subdirectory ("${Raptor_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/raptor")
 
 add_library (utility_common INTERFACE)
 target_link_libraries ("utility_common" INTERFACE raptor::raptor)

diff --git a/util/iScience/CMakeLists.txt b/util/iScience/CMakeLists.txt
@@ -8,8 +8,9 @@ set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
-get_filename_component (RAPTOR_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
-add_subdirectory ("${RAPTOR_ROOT_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/raptor")
+get_filename_component (Raptor_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
+include ("${Raptor_SOURCE_DIR}/cmake/configuration.cmake")
+add_subdirectory ("${Raptor_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/raptor")
 
 # Define cmake configuration flags to configure and build external projects with the same flags as specified for
 # this project.

diff --git a/util/iScience/thresholding/CMakeLists.txt b/util/iScience/thresholding/CMakeLists.txt
@@ -21,11 +21,8 @@ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 # Dependencies
-include (${CMAKE_CURRENT_LIST_DIR}/../../../cmake/CPM.cmake)
-CPMUsePackageLock (${CMAKE_CURRENT_LIST_DIR}/../../../cmake/package-lock.cmake)
-
-CPMGetPackage (sharg)
-CPMGetPackage (seqan3)
+get_filename_component (Raptor_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE)
+include ("${Raptor_SOURCE_DIR}/cmake/configuration.cmake")
 
 add_library (common_thresholding INTERFACE)
 target_link_libraries ("common_thresholding" INTERFACE seqan3::seqan3 sharg::sharg)

diff --git a/util/test/CMakeLists.txt b/util/test/CMakeLists.txt
@@ -10,8 +10,9 @@ set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
-get_filename_component (RAPTOR_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
-add_subdirectory ("${RAPTOR_ROOT_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/raptor")
+get_filename_component (Raptor_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
+include ("${Raptor_SOURCE_DIR}/cmake/configuration.cmake")
+add_subdirectory ("${Raptor_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/raptor")
 target_compile_options (raptor_raptor INTERFACE "-pedantic" "-Wall" "-Wextra" "-Werror")
 
 get_filename_component (RAPTOR_UTIL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../dummy" DIRECTORY)