Skip to content

Commit c88e7a5

Browse files
ye-luoye-luo
committed
cmake change subdirs to add_subdirectory
1 parent 472b0fb commit c88e7a5

16 files changed

+140
-122
lines changed

‎.cmake-format

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# -----------------------------
2+
# Options affecting formatting.
3+
# -----------------------------
4+
with section("format"):
5+
6+
# How wide to allow formatted cmake files
7+
line_width = 120
8+
9+
# ------------------------------------------------
10+
# Options affecting comment reflow and formatting.
11+
# ------------------------------------------------
12+
with section("markup"):
13+
14+
# enable comment markup parsing and reflow
15+
enable_markup = False
16+

‎CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -953,14 +953,14 @@ IF(INSTALL_NEXUS)
953953
INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${qmcpack_SOURCE_DIR}/nexus/install --leave_paths ${CMAKE_INSTALL_PREFIX}/bin)")
954954
ENDIF()
955955

956-
SUBDIRS(src)
956+
add_subdirectory(src)
957957

958958
IF(NOT QMC_BUILD_SANDBOX_ONLY)
959959
IF( NOT QMC_NO_SLOW_CUSTOM_TESTING_COMMANDS )
960-
SUBDIRS(tests)
961-
SUBDIRS(examples)
960+
add_subdirectory(tests)
961+
add_subdirectory(examples)
962962
ENDIF()
963963
IF(IS_DIRECTORY "${PROJECT_SOURCE_DIR}/nexus" AND INSTALL_NEXUS)
964-
SUBDIRS(nexus/tests)
964+
add_subdirectory(nexus/tests)
965965
ENDIF()
966966
ENDIF()

‎src/AFQMC/CMakeLists.txt

+11-11
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,16 @@ IF (BUILD_UNIT_TESTS)
171171
SET(AFQMC_UNIT_TEST_INPUTS ${AFQMC_UNIT_TEST_INPUT_REAL_DENSE})
172172
ENDIF()
173173
ENDIF()
174-
SUBDIRS(Matrix/tests)
175-
SUBDIRS(Numerics/tests)
176-
#SUBDIRS(Numerics/shm_tests)
177-
SUBDIRS(SlaterDeterminantOperations/tests)
178-
SUBDIRS(Walkers/tests)
179-
SUBDIRS(Hamiltonians/tests)
180-
SUBDIRS(HamiltonianOperations/tests)
181-
SUBDIRS(Wavefunctions/tests)
182-
SUBDIRS(Propagators/tests)
183-
SUBDIRS(Estimators/tests)
174+
add_subdirectory(Matrix/tests)
175+
add_subdirectory(Numerics/tests)
176+
#add_subdirectory(Numerics/shm_tests)
177+
add_subdirectory(SlaterDeterminantOperations/tests)
178+
add_subdirectory(Walkers/tests)
179+
add_subdirectory(Hamiltonians/tests)
180+
add_subdirectory(HamiltonianOperations/tests)
181+
add_subdirectory(Wavefunctions/tests)
182+
add_subdirectory(Propagators/tests)
183+
add_subdirectory(Estimators/tests)
184184
ENDIF()
185185

186-
SUBDIRS(Numerics/performance)
186+
add_subdirectory(Numerics/performance)

‎src/CMakeLists.txt

+30-30
Original file line numberDiff line numberDiff line change
@@ -168,57 +168,57 @@ ENDIF(USE_OBJECT_TARGET)
168168
)
169169
ADD_LIBRARY(qmcfakerng ${UNIT_TEST_UTILITIES})
170170

171-
SUBDIRS(io)
172-
SUBDIRS(einspline)
173-
SUBDIRS(Containers)
174-
SUBDIRS(Message)
175-
SUBDIRS(Platforms)
176-
SUBDIRS(Particle)
177-
SUBDIRS(Utilities)
171+
add_subdirectory(io)
172+
add_subdirectory(einspline)
173+
add_subdirectory(Containers)
174+
add_subdirectory(Message)
175+
add_subdirectory(Platforms)
176+
add_subdirectory(Particle)
177+
add_subdirectory(Utilities)
178178

179179
if(QMC_BUILD_SANDBOX_ONLY)
180180

181181
MESSAGE(STATUS "Minimal build: only Sandbox")
182-
SUBDIRS(Sandbox)
182+
add_subdirectory(Sandbox)
183183

184184
else() #{{{
185185

186-
SUBDIRS(QMCWaveFunctions)
187-
SUBDIRS(QMCHamiltonians)
188-
SUBDIRS(Estimators)
189-
SUBDIRS(QMCDrivers)
186+
add_subdirectory(QMCWaveFunctions)
187+
add_subdirectory(QMCHamiltonians)
188+
add_subdirectory(Estimators)
189+
add_subdirectory(QMCDrivers)
190190

191191
IF(BUILD_LMYENGINE_INTERFACE)
192192
SET(FORMIC_BINARY_DIR ${qmcpack_BINARY_DIR})
193-
SUBDIRS(formic/utils)
193+
add_subdirectory(formic/utils)
194194
ENDIF(BUILD_LMYENGINE_INTERFACE)
195195

196196
IF(BUILD_AFQMC)
197-
SUBDIRS(AFQMC)
197+
add_subdirectory(AFQMC)
198198
ENDIF(BUILD_AFQMC)
199199

200200
IF(BUILD_FCIQMC)
201-
SUBDIRS(FCIQMC)
201+
add_subdirectory(FCIQMC)
202202
ENDIF(BUILD_FCIQMC)
203203

204-
SUBDIRS(QMCApp)
205-
SUBDIRS(QMCTools)
204+
add_subdirectory(QMCApp)
205+
add_subdirectory(QMCTools)
206206

207207
IF (BUILD_UNIT_TESTS) #{
208208
#Unit test directories
209-
SUBDIRS(Numerics/tests)
210-
SUBDIRS(Utilities/tests)
211-
SUBDIRS(einspline/tests)
212-
SUBDIRS(spline2/tests)
213-
SUBDIRS(Concurrency/tests)
214-
SUBDIRS(QMCWaveFunctions/tests)
215-
SUBDIRS(QMCHamiltonians/tests)
216-
SUBDIRS(type_traits/tests)
217-
SUBDIRS(QMCDrivers/tests)
218-
SUBDIRS(QMCApp/tests)
219-
SUBDIRS(Message/tests)
220-
SUBDIRS(Optimize/tests)
221-
SUBDIRS(QMCTools/tests)
209+
add_subdirectory(Numerics/tests)
210+
add_subdirectory(Utilities/tests)
211+
add_subdirectory(einspline/tests)
212+
add_subdirectory(spline2/tests)
213+
add_subdirectory(Concurrency/tests)
214+
add_subdirectory(QMCWaveFunctions/tests)
215+
add_subdirectory(QMCHamiltonians/tests)
216+
add_subdirectory(type_traits/tests)
217+
add_subdirectory(QMCDrivers/tests)
218+
add_subdirectory(QMCApp/tests)
219+
add_subdirectory(Message/tests)
220+
add_subdirectory(Optimize/tests)
221+
add_subdirectory(QMCTools/tests)
222222
ENDIF() #}
223223

224224
endif() #}}}

‎src/Containers/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ TARGET_INCLUDE_DIRECTORIES(containers PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
2323
TARGET_LINK_LIBRARIES(containers PUBLIC platform_device)
2424

2525
IF (BUILD_UNIT_TESTS)
26-
SUBDIRS(OhmmsPETE/tests)
27-
SUBDIRS(OhmmsSoA/tests)
28-
SUBDIRS(MinimalContainers/tests)
26+
add_subdirectory(OhmmsPETE/tests)
27+
add_subdirectory(OhmmsSoA/tests)
28+
add_subdirectory(MinimalContainers/tests)
2929
ENDIF()

‎src/Estimators/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ TARGET_INCLUDE_DIRECTORIES(qmcestimators_unit PUBLIC "${CMAKE_CURRENT_SOURCE_DIR
4040
TARGET_LINK_LIBRARIES(qmcestimators PUBLIC containers qmcham qmcparticle qmcutil)
4141
TARGET_LINK_LIBRARIES(qmcestimators_unit PUBLIC containers qmcham_unit qmcparticle qmcutil)
4242

43-
SUBDIRS(tests)
43+
add_subdirectory(tests)
4444

4545
# TARGET_LINK_LIBRARIES(qmcest PUBLIC qmcham)
4646
# TARGET_LINK_LIBRARIES(qmcdriver_unit PUBLIC qmcham_unit)

‎src/Particle/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ IF(QMC_CUDA)
8282
ENDIF(QMC_CUDA)
8383

8484
IF(BUILD_UNIT_TESTS)
85-
SUBDIRS(tests)
86-
SUBDIRS(Lattice/tests)
87-
SUBDIRS(LongRange/tests)
88-
SUBDIRS(ParticleIO/tests)
89-
SUBDIRS(ParticleBase/tests)
85+
add_subdirectory(tests)
86+
add_subdirectory(Lattice/tests)
87+
add_subdirectory(LongRange/tests)
88+
add_subdirectory(ParticleIO/tests)
89+
add_subdirectory(ParticleBase/tests)
9090
ENDIF()

‎src/Platforms/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ ENDIF(USE_OBJECT_TARGET)
3131

3232
TARGET_INCLUDE_DIRECTORIES(platform_device PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
3333

34-
SUBDIRS(CPU)
34+
add_subdirectory(CPU)
3535
TARGET_LINK_LIBRARIES(platform_device PUBLIC platform_cpu)
3636

37-
SUBDIRS(OMPTarget)
37+
add_subdirectory(OMPTarget)
3838
TARGET_LINK_LIBRARIES(platform_device PUBLIC platform_omptarget)
3939

4040
IF(QMC_CUDA)
41-
SUBDIRS(CUDA_legacy)
41+
add_subdirectory(CUDA_legacy)
4242
TARGET_LINK_LIBRARIES(platform_device PUBLIC platform_cuda_legacy)
4343
ENDIF(QMC_CUDA)
4444

4545
IF(ENABLE_CUDA)
46-
SUBDIRS(CUDA)
46+
add_subdirectory(CUDA)
4747
TARGET_LINK_LIBRARIES(platform_device PUBLIC platform_cuda)
4848
ENDIF(ENABLE_CUDA)
4949

50-
SUBDIRS(tests)
50+
add_subdirectory(tests)

‎src/Platforms/tests/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
IF (BUILD_UNIT_TESTS)
1414
IF(ENABLE_CUDA)
15-
SUBDIRS(CUDA)
15+
add_subdirectory(CUDA)
1616
ENDIF()
1717

18-
SUBDIRS(OMPTarget)
19-
SUBDIRS(CPU)
18+
add_subdirectory(OMPTarget)
19+
add_subdirectory(CPU)
2020
ENDIF()

‎src/QMCTools/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ ENDIF()
8686
INSTALL(TARGETS qmcfinitesize
8787
RUNTIME DESTINATION bin)
8888

89-
SUBDIRS(ppconvert)
89+
add_subdirectory(ppconvert)

‎src/io/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
#//////////////////////////////////////////////////////////////////////////////////////
1111

1212

13-
SUBDIRS(hdf)
14-
SUBDIRS(OhmmsData)
13+
add_subdirectory(hdf)
14+
add_subdirectory(OhmmsData)
1515

1616
ADD_LIBRARY(qmcio INTERFACE)
1717
TARGET_INCLUDE_DIRECTORIES(qmcio INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
1818
TARGET_LINK_LIBRARIES(qmcio INTERFACE qmcio_hdf qmcio_xml)
1919

2020
IF(BUILD_UNIT_TESTS)
21-
SUBDIRS(tests)
21+
add_subdirectory(tests)
2222
ENDIF()

‎src/io/tests/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111

1212

1313
IF(BUILD_UNIT_TESTS)
14-
SUBDIRS(hdf)
15-
SUBDIRS(OhmmsData)
14+
add_subdirectory(hdf)
15+
add_subdirectory(OhmmsData)
1616
ENDIF()

‎tests/CMakeLists.txt

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ IF ( NOT QMC_VERBOSE_CONFIGURATION )
33
MESSAGE("Set QMC_VERBOSE_CONFIGURATION=1 for details of which tests will be enabled.")
44
ENDIF()
55

6-
SUBDIRS(converter)
7-
SUBDIRS(estimator)
8-
SUBDIRS(models)
9-
SUBDIRS(io)
10-
SUBDIRS(performance)
6+
add_subdirectory(converter)
7+
add_subdirectory(estimator)
8+
add_subdirectory(models)
9+
add_subdirectory(io)
10+
add_subdirectory(performance)
1111

1212
IF(QE_FOUND)
13-
SUBDIRS(pw2qmcpack)
13+
add_subdirectory(pw2qmcpack)
1414
ENDIF()
1515

1616
message("Adding system tests for QMCPACK")
@@ -43,7 +43,7 @@ IF(BUILD_AFQMC)
4343
CHECK_PYTHON_REQS(afqmctools_python_reqs afqmc_workflow add_tests)
4444
IF(add_tests)
4545
message("Adding tests for AFQMC workflow.")
46-
SUBDIRS("afqmc/workflow")
46+
add_subdirectory("afqmc/workflow")
4747
ENDIF()
4848
ENDIF()
4949

@@ -55,7 +55,7 @@ IF(HAVE_PYSCF)
5555

5656
IF(add_tests)
5757
message("Python dependencies met. Adding PySCF workflow tests")
58-
SUBDIRS("pyscf")
58+
add_subdirectory("pyscf")
5959
ENDIF()
6060
ENDIF()
6161
ENDIF()
@@ -64,8 +64,8 @@ ENDIF()
6464
if(NOT ${QMCAPP_ERR} STREQUAL "")
6565
message("${QMCAPP_ERR} skipping tests")
6666
else()
67-
SUBDIRS("heg/heg_14_gamma")
68-
SUBDIRS("heg/heg_54_J2rpa")
69-
SUBDIRS("molecules")
70-
SUBDIRS("solids")
67+
add_subdirectory("heg/heg_14_gamma")
68+
add_subdirectory("heg/heg_54_J2rpa")
69+
add_subdirectory("molecules")
70+
add_subdirectory("solids")
7171
endif()

‎tests/molecules/CMakeLists.txt

+19-19
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
# Molecules
55
#
66

7-
SUBDIRS("Li2_STO_ae")
8-
SUBDIRS("C2_pp")
9-
SUBDIRS("C4_ae")
10-
SUBDIRS("LiH_ae_gms")
11-
SUBDIRS("LiH_ae_pyscf")
12-
SUBDIRS("O_ae_pyscf_UHF")
13-
SUBDIRS("LiH_ae_qp")
14-
SUBDIRS("LiH_pp")
15-
SUBDIRS("H2_ae")
16-
SUBDIRS("H4_ae")
17-
SUBDIRS("H4_msd_ae")
18-
SUBDIRS("H2O_dimer_sep_pp")
19-
SUBDIRS("FeCO6_b3lyp_gms")
20-
SUBDIRS("FeCO6_b3lyp_pyscf")
21-
SUBDIRS("CHN_ae")
22-
SUBDIRS("LiH_ae_MSD")
23-
SUBDIRS("He_ae")
24-
SUBDIRS("He_param")
25-
SUBDIRS("Co_L2")
7+
add_subdirectory("Li2_STO_ae")
8+
add_subdirectory("C2_pp")
9+
add_subdirectory("C4_ae")
10+
add_subdirectory("LiH_ae_gms")
11+
add_subdirectory("LiH_ae_pyscf")
12+
add_subdirectory("O_ae_pyscf_UHF")
13+
add_subdirectory("LiH_ae_qp")
14+
add_subdirectory("LiH_pp")
15+
add_subdirectory("H2_ae")
16+
add_subdirectory("H4_ae")
17+
add_subdirectory("H4_msd_ae")
18+
add_subdirectory("H2O_dimer_sep_pp")
19+
add_subdirectory("FeCO6_b3lyp_gms")
20+
add_subdirectory("FeCO6_b3lyp_pyscf")
21+
add_subdirectory("CHN_ae")
22+
add_subdirectory("LiH_ae_MSD")
23+
add_subdirectory("He_ae")
24+
add_subdirectory("He_param")
25+
add_subdirectory("Co_L2")

‎tests/performance/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ ELSE()
99
ENDIF()
1010

1111
# includes
12-
SUBDIRS(NiO C-graphite C-molecule)
12+
add_subdirectory(NiO)
13+
add_subdirectory(C-graphite)
14+
add_subdirectory(C-molecule)
1315

0 commit comments

Comments
 (0)