Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cmake updates #52

Merged
merged 2 commits into from
Aug 21, 2024
Merged

Cmake updates #52

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5484bd
COMP: Change from FetchContent_Populate to FetchContent_MakeAvailable
thewtex Aug 19, 2024
a8ba12c
COMP: Add find_package(OpenMP) to module export code
thewtex Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10.2)
cmake_minimum_required(VERSION 3.16.2)
project(TotalVariation)

if(ITK_USE_SYSTEM_proxTV)
Expand Down Expand Up @@ -35,12 +35,14 @@ if(TotalVariation_proxTV_USE_EIGEN)
find_package(Eigen3 REQUIRED)
set(${PROJECT_NAME}_EXPORT_CODE_INSTALL
"${${PROJECT_NAME}_EXPORT_CODE_INSTALL}
find_package(OpenMP)
set(Eigen3_DIR \"${Eigen3_DIR}\")
find_package(Eigen3 REQUIRED CONFIG)
")
set(${PROJECT_NAME}_EXPORT_CODE_BUILD
"${${PROJECT_NAME}_EXPORT_CODE_BUILD}
if(NOT ITK_BINARY_DIR)
find_package(OpenMP)
set(Eigen3_DIR \"${Eigen3_DIR}\")
find_package(Eigen3 REQUIRED CONFIG)
endif()
Expand All @@ -63,6 +65,7 @@ if(ITK_USE_SYSTEM_proxTV)
set(${PROJECT_NAME}_EXPORT_CODE_BUILD
"${${PROJECT_NAME}_EXPORT_CODE_BUILD}
if(NOT ITK_BINARY_DIR)
find_package(OpenMP)
set(proxTV_DIR \"${proxTV_DIR_BUILD}\")
find_package(proxTV REQUIRED CONFIG)
endif()
Expand Down Expand Up @@ -109,10 +112,7 @@ else() # build proxTV here with the selected Eigen3
endif()
# end proxTV options

if(NOT proxtv_fetch_POPULATED)
FetchContent_Populate(proxTV_fetch)
add_subdirectory(${proxtv_fetch_SOURCE_DIR} ${proxtv_fetch_BINARY_DIR})
endif()
FetchContent_MakeAvailable(proxTV_fetch)
# proxTV will generate a target proxTV::proxTV when using find_package,
# or a library proxTV when using add_subdirectory
set(_proxTV_lib proxTV) # proxTV generated in subdirectory
Expand All @@ -122,6 +122,7 @@ endif()
# When this module is loaded by an app, load proxTV too.
set(${PROJECT_NAME}_EXPORT_CODE_INSTALL
"${${PROJECT_NAME}_EXPORT_CODE_INSTALL}
find_package(OpenMP)
set(proxTV_DIR \"${proxTV_DIR_INSTALL}\")
find_package(proxTV REQUIRED CONFIG)
")
Expand Down
Loading