diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b5222f..dfc6b95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,6 @@ endif () #------------------------------------------------------------------------------- macro (register_project name url default_tag) string (TOUPPER ${name} dir) - set (depends "${ARGN}") option (BUILD_${dir} "Build ${name} subproject." OFF) set (BUILD_TAG_${dir} ${default_tag} CACHE STRING "Name of the tag to checkout.") @@ -82,7 +81,7 @@ macro (register_project name url default_tag) SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${dir} ) - FetchContent_MakeAvailable(${name} ${depends}) + FetchContent_MakeAvailable(${name}) if (GIT_FOUND) # By default cmake clones projects in a headless state. After the repo is @@ -124,21 +123,19 @@ endmacro () # SUB) #Optional Sub project directories. #------------------------------------------------------------------------------- -# Register LIBSTELL -register_project(libstell - ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/LIBSTELL.git - master) - +# Register BOOZ_XFORM register_project(booz_xform ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/BOOZ_XFORM.git master libstell) -# Register LGRID -register_project(lgrid - ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/LGRID.git +# Register V3FIT +register_project(v3fit + ${URL_PROTO}github.com${URL_SEP}cianciosa/V3FIT.git master - libstell) + siesta + v3rfun + lgrid) # Register V3RFUN register_project(v3rfun @@ -146,6 +143,25 @@ register_project(v3rfun master libstell) +# Register SIESTA +register_project(siesta + ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/SIESTA.git + master + parvmec + bmw) + +# Register LGRID +register_project(lgrid + ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/LGRID.git + master + libstell) + +# Register SURFACE +register_project(surface + ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/SURFACE.git + master + bmw) + # Register BMW register_project(bmw ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/BMW.git @@ -158,12 +174,6 @@ register_project(descur master libstell) -# Register MAKEGRID -register_project(makegrid - ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/MAKEGRID.git - master - libstell) - # Register PARVMEC register_project(parvmec ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/PARVMEC.git @@ -171,23 +181,13 @@ register_project(parvmec makegrid libstell) -# Register SIESTA -register_project(siesta - ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/SIESTA.git - master - parvmec - bmw) - -# Register V3FIT -register_project(v3fit - ${URL_PROTO}github.com${URL_SEP}cianciosa/V3FIT.git +# Register MAKEGRID +register_project(makegrid + ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/MAKEGRID.git master - siesta - v3rfun - lgrid) + libstell) -# Register SURFACE -register_project(surface - ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/SURFACE.git - master - bmw) +# Register LIBSTELL +register_project(libstell + ${URL_PROTO}github.com${URL_SEP}ORNL-Fusion/LIBSTELL.git + master)