cmake change subdirs to add_subdirectory

.cmake-format

@@ -0,0 +1,16 @@
+# -----------------------------
+# Options affecting formatting.
+# -----------------------------
+with section("format"):
+
+  # How wide to allow formatted cmake files
+  line_width = 120
+
+# ------------------------------------------------
+# Options affecting comment reflow and formatting.
+# ------------------------------------------------
+with section("markup"):
+
+  # enable comment markup parsing and reflow
+  enable_markup = False
+

CMakeLists.txt

@@ -953,14 +953,14 @@ IF(INSTALL_NEXUS)
   INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${qmcpack_SOURCE_DIR}/nexus/install --leave_paths ${CMAKE_INSTALL_PREFIX}/bin)")
 ENDIF()
 
-SUBDIRS(src)
+add_subdirectory(src)
 
 IF(NOT QMC_BUILD_SANDBOX_ONLY)
   IF( NOT QMC_NO_SLOW_CUSTOM_TESTING_COMMANDS )
-    SUBDIRS(tests)
-    SUBDIRS(examples)
+    add_subdirectory(tests)
+    add_subdirectory(examples)
   ENDIF()
   IF(IS_DIRECTORY "${PROJECT_SOURCE_DIR}/nexus" AND INSTALL_NEXUS)
-    SUBDIRS(nexus/tests)
+    add_subdirectory(nexus/tests)
   ENDIF()
 ENDIF()

src/AFQMC/CMakeLists.txt

@@ -171,16 +171,16 @@ IF (BUILD_UNIT_TESTS)
       SET(AFQMC_UNIT_TEST_INPUTS ${AFQMC_UNIT_TEST_INPUT_REAL_DENSE})
     ENDIF()
   ENDIF()
-  SUBDIRS(Matrix/tests)
-  SUBDIRS(Numerics/tests)
-  #SUBDIRS(Numerics/shm_tests)
-  SUBDIRS(SlaterDeterminantOperations/tests)
-  SUBDIRS(Walkers/tests)
-  SUBDIRS(Hamiltonians/tests)
-  SUBDIRS(HamiltonianOperations/tests)
-  SUBDIRS(Wavefunctions/tests)
-  SUBDIRS(Propagators/tests)
-  SUBDIRS(Estimators/tests)
+  add_subdirectory(Matrix/tests)
+  add_subdirectory(Numerics/tests)
+  #add_subdirectory(Numerics/shm_tests)
+  add_subdirectory(SlaterDeterminantOperations/tests)
+  add_subdirectory(Walkers/tests)
+  add_subdirectory(Hamiltonians/tests)
+  add_subdirectory(HamiltonianOperations/tests)
+  add_subdirectory(Wavefunctions/tests)
+  add_subdirectory(Propagators/tests)
+  add_subdirectory(Estimators/tests)
 ENDIF()
 
-SUBDIRS(Numerics/performance)
+add_subdirectory(Numerics/performance)

src/CMakeLists.txt

@@ -168,57 +168,57 @@ ENDIF(USE_OBJECT_TARGET)
   )
   ADD_LIBRARY(qmcfakerng ${UNIT_TEST_UTILITIES})
 
-  SUBDIRS(io)
-  SUBDIRS(einspline)
-  SUBDIRS(Containers)
-  SUBDIRS(Message)
-  SUBDIRS(Platforms)
-  SUBDIRS(Particle)
-  SUBDIRS(Utilities)
+  add_subdirectory(io)
+  add_subdirectory(einspline)
+  add_subdirectory(Containers)
+  add_subdirectory(Message)
+  add_subdirectory(Platforms)
+  add_subdirectory(Particle)
+  add_subdirectory(Utilities)
 
 if(QMC_BUILD_SANDBOX_ONLY)
 
   MESSAGE(STATUS "Minimal build: only Sandbox")
-  SUBDIRS(Sandbox)
+  add_subdirectory(Sandbox)
 
 else() #{{{
 
-  SUBDIRS(QMCWaveFunctions)
-  SUBDIRS(QMCHamiltonians)
-  SUBDIRS(Estimators)
-  SUBDIRS(QMCDrivers)
+  add_subdirectory(QMCWaveFunctions)
+  add_subdirectory(QMCHamiltonians)
+  add_subdirectory(Estimators)
+  add_subdirectory(QMCDrivers)
 
   IF(BUILD_LMYENGINE_INTERFACE)
     SET(FORMIC_BINARY_DIR ${qmcpack_BINARY_DIR})
-    SUBDIRS(formic/utils)
+    add_subdirectory(formic/utils)
   ENDIF(BUILD_LMYENGINE_INTERFACE)
 
   IF(BUILD_AFQMC)
-   SUBDIRS(AFQMC)
+   add_subdirectory(AFQMC)
   ENDIF(BUILD_AFQMC)
 
   IF(BUILD_FCIQMC)
-   SUBDIRS(FCIQMC)
+   add_subdirectory(FCIQMC)
   ENDIF(BUILD_FCIQMC)
 
-  SUBDIRS(QMCApp)
-  SUBDIRS(QMCTools)
+  add_subdirectory(QMCApp)
+  add_subdirectory(QMCTools)
 
   IF (BUILD_UNIT_TESTS) #{
     #Unit test directories
-    SUBDIRS(Numerics/tests)
-    SUBDIRS(Utilities/tests)
-    SUBDIRS(einspline/tests)
-    SUBDIRS(spline2/tests)
-    SUBDIRS(Concurrency/tests)
-    SUBDIRS(QMCWaveFunctions/tests)
-    SUBDIRS(QMCHamiltonians/tests)
-    SUBDIRS(type_traits/tests)
-    SUBDIRS(QMCDrivers/tests)
-    SUBDIRS(QMCApp/tests)
-    SUBDIRS(Message/tests)
-    SUBDIRS(Optimize/tests)
-    SUBDIRS(QMCTools/tests)
+    add_subdirectory(Numerics/tests)
+    add_subdirectory(Utilities/tests)
+    add_subdirectory(einspline/tests)
+    add_subdirectory(spline2/tests)
+    add_subdirectory(Concurrency/tests)
+    add_subdirectory(QMCWaveFunctions/tests)
+    add_subdirectory(QMCHamiltonians/tests)
+    add_subdirectory(type_traits/tests)
+    add_subdirectory(QMCDrivers/tests)
+    add_subdirectory(QMCApp/tests)
+    add_subdirectory(Message/tests)
+    add_subdirectory(Optimize/tests)
+    add_subdirectory(QMCTools/tests)
   ENDIF() #}
 
 endif() #}}}

src/Containers/CMakeLists.txt

@@ -23,7 +23,7 @@ TARGET_INCLUDE_DIRECTORIES(containers PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 TARGET_LINK_LIBRARIES(containers PUBLIC platform_device)
 
 IF (BUILD_UNIT_TESTS)
-  SUBDIRS(OhmmsPETE/tests)
-  SUBDIRS(OhmmsSoA/tests)
-  SUBDIRS(MinimalContainers/tests)
+  add_subdirectory(OhmmsPETE/tests)
+  add_subdirectory(OhmmsSoA/tests)
+  add_subdirectory(MinimalContainers/tests)
 ENDIF()

src/Estimators/CMakeLists.txt

@@ -40,7 +40,7 @@ TARGET_INCLUDE_DIRECTORIES(qmcestimators_unit PUBLIC "${CMAKE_CURRENT_SOURCE_DIR
 TARGET_LINK_LIBRARIES(qmcestimators PUBLIC containers qmcham qmcparticle qmcutil)
 TARGET_LINK_LIBRARIES(qmcestimators_unit PUBLIC containers qmcham_unit qmcparticle qmcutil)
 
-SUBDIRS(tests)
+add_subdirectory(tests)
 
 # TARGET_LINK_LIBRARIES(qmcest PUBLIC qmcham)
 # TARGET_LINK_LIBRARIES(qmcdriver_unit PUBLIC qmcham_unit)

src/Particle/CMakeLists.txt

@@ -82,9 +82,9 @@ IF(QMC_CUDA)
 ENDIF(QMC_CUDA)
 
 IF(BUILD_UNIT_TESTS)
-  SUBDIRS(tests)
-  SUBDIRS(Lattice/tests)
-  SUBDIRS(LongRange/tests)
-  SUBDIRS(ParticleIO/tests)
-  SUBDIRS(ParticleBase/tests)
+  add_subdirectory(tests)
+  add_subdirectory(Lattice/tests)
+  add_subdirectory(LongRange/tests)
+  add_subdirectory(ParticleIO/tests)
+  add_subdirectory(ParticleBase/tests)
 ENDIF()

src/Platforms/CMakeLists.txt

@@ -31,20 +31,20 @@ ENDIF(USE_OBJECT_TARGET)
 
 TARGET_INCLUDE_DIRECTORIES(platform_device PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 
-SUBDIRS(CPU)
+add_subdirectory(CPU)
 TARGET_LINK_LIBRARIES(platform_device PUBLIC platform_cpu)
 
-SUBDIRS(OMPTarget)
+add_subdirectory(OMPTarget)
 TARGET_LINK_LIBRARIES(platform_device PUBLIC platform_omptarget)
 
 IF(QMC_CUDA)
-  SUBDIRS(CUDA_legacy)
+  add_subdirectory(CUDA_legacy)
   TARGET_LINK_LIBRARIES(platform_device PUBLIC platform_cuda_legacy)
 ENDIF(QMC_CUDA)
 
 IF(ENABLE_CUDA)
-  SUBDIRS(CUDA)
+  add_subdirectory(CUDA)
   TARGET_LINK_LIBRARIES(platform_device PUBLIC platform_cuda)
 ENDIF(ENABLE_CUDA)
 
-SUBDIRS(tests)
+add_subdirectory(tests)

src/Platforms/tests/CMakeLists.txt

@@ -12,9 +12,9 @@
 
 IF (BUILD_UNIT_TESTS)
   IF(ENABLE_CUDA)
-    SUBDIRS(CUDA)
+    add_subdirectory(CUDA)
   ENDIF()
 
-  SUBDIRS(OMPTarget)
-  SUBDIRS(CPU)
+  add_subdirectory(OMPTarget)
+  add_subdirectory(CPU)
 ENDIF()

src/QMCTools/CMakeLists.txt

@@ -86,4 +86,4 @@ ENDIF()
 INSTALL(TARGETS qmcfinitesize
         RUNTIME DESTINATION bin)
 
-SUBDIRS(ppconvert)
+add_subdirectory(ppconvert)

src/io/CMakeLists.txt

@@ -10,13 +10,13 @@
 #//////////////////////////////////////////////////////////////////////////////////////
 
 
-SUBDIRS(hdf)
-SUBDIRS(OhmmsData)
+add_subdirectory(hdf)
+add_subdirectory(OhmmsData)
 
 ADD_LIBRARY(qmcio INTERFACE)
 TARGET_INCLUDE_DIRECTORIES(qmcio INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
 TARGET_LINK_LIBRARIES(qmcio INTERFACE qmcio_hdf qmcio_xml)
 
 IF(BUILD_UNIT_TESTS)
-  SUBDIRS(tests)
+  add_subdirectory(tests)
 ENDIF()

src/io/tests/CMakeLists.txt

@@ -11,6 +11,6 @@
 
 
 IF(BUILD_UNIT_TESTS)
-  SUBDIRS(hdf)
-  SUBDIRS(OhmmsData)
+  add_subdirectory(hdf)
+  add_subdirectory(OhmmsData)
 ENDIF()

tests/CMakeLists.txt

@@ -3,14 +3,14 @@ IF ( NOT QMC_VERBOSE_CONFIGURATION )
   MESSAGE("Set QMC_VERBOSE_CONFIGURATION=1 for details of which tests will be enabled.")
 ENDIF()
 
-SUBDIRS(converter)
-SUBDIRS(estimator)
-SUBDIRS(models)
-SUBDIRS(io)
-SUBDIRS(performance)
+add_subdirectory(converter)
+add_subdirectory(estimator)
+add_subdirectory(models)
+add_subdirectory(io)
+add_subdirectory(performance)
 
 IF(QE_FOUND)
-  SUBDIRS(pw2qmcpack)
+  add_subdirectory(pw2qmcpack)
 ENDIF()
 
 message("Adding system tests for QMCPACK")
@@ -43,7 +43,7 @@ IF(BUILD_AFQMC)
   CHECK_PYTHON_REQS(afqmctools_python_reqs afqmc_workflow add_tests)
   IF(add_tests)
     message("Adding tests for AFQMC workflow.")
-    SUBDIRS("afqmc/workflow")
+    add_subdirectory("afqmc/workflow")
   ENDIF()
 ENDIF()
 
@@ -55,7 +55,7 @@ IF(HAVE_PYSCF)
 
     IF(add_tests)
       message("Python dependencies met. Adding PySCF workflow tests")
-      SUBDIRS("pyscf")
+      add_subdirectory("pyscf")
     ENDIF()
   ENDIF()
 ENDIF()
@@ -64,8 +64,8 @@ ENDIF()
 if(NOT ${QMCAPP_ERR} STREQUAL "")
     message("${QMCAPP_ERR}  skipping tests")
 else()
-    SUBDIRS("heg/heg_14_gamma")
-    SUBDIRS("heg/heg_54_J2rpa")
-    SUBDIRS("molecules")
-    SUBDIRS("solids")
+    add_subdirectory("heg/heg_14_gamma")
+    add_subdirectory("heg/heg_54_J2rpa")
+    add_subdirectory("molecules")
+    add_subdirectory("solids")
 endif()

tests/molecules/CMakeLists.txt

@@ -4,22 +4,22 @@
 # Molecules
 #
 
-SUBDIRS("Li2_STO_ae")
-SUBDIRS("C2_pp")
-SUBDIRS("C4_ae")
-SUBDIRS("LiH_ae_gms")
-SUBDIRS("LiH_ae_pyscf")
-SUBDIRS("O_ae_pyscf_UHF")
-SUBDIRS("LiH_ae_qp")
-SUBDIRS("LiH_pp")
-SUBDIRS("H2_ae")
-SUBDIRS("H4_ae")
-SUBDIRS("H4_msd_ae")
-SUBDIRS("H2O_dimer_sep_pp")
-SUBDIRS("FeCO6_b3lyp_gms")
-SUBDIRS("FeCO6_b3lyp_pyscf")
-SUBDIRS("CHN_ae")
-SUBDIRS("LiH_ae_MSD")
-SUBDIRS("He_ae")
-SUBDIRS("He_param")
-SUBDIRS("Co_L2")
+add_subdirectory("Li2_STO_ae")
+add_subdirectory("C2_pp")
+add_subdirectory("C4_ae")
+add_subdirectory("LiH_ae_gms")
+add_subdirectory("LiH_ae_pyscf")
+add_subdirectory("O_ae_pyscf_UHF")
+add_subdirectory("LiH_ae_qp")
+add_subdirectory("LiH_pp")
+add_subdirectory("H2_ae")
+add_subdirectory("H4_ae")
+add_subdirectory("H4_msd_ae")
+add_subdirectory("H2O_dimer_sep_pp")
+add_subdirectory("FeCO6_b3lyp_gms")
+add_subdirectory("FeCO6_b3lyp_pyscf")
+add_subdirectory("CHN_ae")
+add_subdirectory("LiH_ae_MSD")
+add_subdirectory("He_ae")
+add_subdirectory("He_param")
+add_subdirectory("Co_L2")

tests/performance/CMakeLists.txt

@@ -9,5 +9,7 @@ ELSE()
 ENDIF()
 
 # includes 
-SUBDIRS(NiO C-graphite C-molecule)
+add_subdirectory(NiO)
+add_subdirectory(C-graphite)
+add_subdirectory(C-molecule)