Skip to content

Commit

Permalink
Merge pull request #33 from andrsd/cmake-deps-imps
Browse files Browse the repository at this point in the history
maint: improving/simplifying how deps are handled
  • Loading branch information
andrsd authored Jan 2, 2025
2 parents 69231cf + b2d7fd3 commit 85f8314
Showing 1 changed file with 2 additions and 19 deletions.
21 changes: 2 additions & 19 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,8 @@ mark_as_advanced(FORCE
FETCHCONTENT_UPDATES_DISCONNECTED_GOOGLETEST
)

if(EXODUSIICPP_LIBRARY_TYPE STREQUAL "STATIC")
FetchContent_GetProperties(exodusIIcpp)
if(NOT exodusIIcpp_POPULATED)
FetchContent_Populate(exodusIIcpp)
add_subdirectory(${exodusiicpp_SOURCE_DIR} ${exodusiicpp_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
else()
FetchContent_MakeAvailable(exodusIIcpp)
endif()

if(GMSHPARSERCPP_LIBRARY_TYPE STREQUAL "STATIC")
FetchContent_GetProperties(gmshparsercpp)
if(NOT gmshparsercpp_POPULATED)
FetchContent_Populate(gmshparsercpp)
add_subdirectory(${gmshparsercpp_SOURCE_DIR} ${gmshparsercpp_BINARY_DIR} EXCLUDE_FROM_ALL)
endif()
else()
FetchContent_MakeAvailable(gmshparsercpp)
endif()
FetchContent_MakeAvailable(exodusIIcpp)
FetchContent_MakeAvailable(gmshparsercpp)

if (GMSH2EXO_BUILD_TESTS)
enable_testing()
Expand Down

0 comments on commit 85f8314

Please sign in to comment.