From bd262087acbd49866fac557444a3ab2bba9169b1 Mon Sep 17 00:00:00 2001 From: "Benjamin T. Johnson" Date: Mon, 12 Aug 2024 04:25:20 +0000 Subject: [PATCH] modification to path prefix for the codes that live in the src/ directory, ensuring that they're accessible within jedi-bundle. --- CMakeLists.txt | 5 +++++ test/CMakeLists.txt | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe85b66..d8c72c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,6 +101,8 @@ export(EXPORT ${PROJECT_NAME}-config FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-targets.cmake" ) +set(CRTM_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + add_subdirectory(test) include(CTest) @@ -127,4 +129,7 @@ else() message(STATUS "No build type specified, defaulting to Release.") endif() +#export the CRTM_SOURCE_DIR for use in the test framework (ensures compatibility with jedi-bundle) + + #set(crtm_LIBRARIES crtm) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 17c753f..e5750a4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -299,7 +299,7 @@ list (APPEND SCoeff_Utils SpcCoeff_NC2BIN ) foreach(testtype IN LISTS SCoeff_Utils) - add_executable(${testtype} ${CMAKE_SOURCE_DIR}/src/Coefficients/SpcCoeff/${testtype}/${testtype}.f90) + add_executable(${testtype} ${CRTM_SOURCE_DIR}/src/Coefficients/SpcCoeff/${testtype}/${testtype}.f90) target_link_libraries(${testtype} PRIVATE crtm) endforeach() @@ -309,7 +309,7 @@ list (APPEND ODAS_Utils ODAS_NC2BIN ) foreach(testtype IN LISTS ODAS_Utils) - add_executable(${testtype} ${CMAKE_SOURCE_DIR}/src/Coefficients/TauCoeff/ODAS/${testtype}/${testtype}.f90) + add_executable(${testtype} ${CRTM_SOURCE_DIR}/src/Coefficients/TauCoeff/ODAS/${testtype}/${testtype}.f90) target_link_libraries(${testtype} PRIVATE crtm) endforeach() @@ -319,7 +319,7 @@ list (APPEND ODPS_Utils ODPS_NC2BIN ) foreach(testtype IN LISTS ODPS_Utils) - add_executable(${testtype} ${CMAKE_SOURCE_DIR}/src/Coefficients/TauCoeff/ODPS/${testtype}/${testtype}.f90) + add_executable(${testtype} ${CRTM_SOURCE_DIR}/src/Coefficients/TauCoeff/ODPS/${testtype}/${testtype}.f90) target_link_libraries(${testtype} PRIVATE crtm) endforeach() @@ -330,7 +330,7 @@ list (APPEND CCoeff_Utils CloudCoeff_Inspect ) foreach(testtype IN LISTS CCoeff_Utils) - add_executable(${testtype} ${CMAKE_SOURCE_DIR}/src/Coefficients/CloudCoeff/${testtype}/${testtype}.f90) + add_executable(${testtype} ${CRTM_SOURCE_DIR}/src/Coefficients/CloudCoeff/${testtype}/${testtype}.f90) target_link_libraries(${testtype} PRIVATE crtm) endforeach()