Skip to content

Commit 183d4f9

Browse files
committed
Build and install original cmake_test program
1 parent 5be1527 commit 183d4f9

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

CMakeLists.txt

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,21 +132,30 @@ set(TEST_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/tests")
132132
add_executable(csv_write_test "${TEST_SOURCE_DIR}/csv_write_test.f90")
133133
target_link_libraries(csv_write_test ${LIBFCSV_NAME})
134134
target_compile_options(csv_write_test PUBLIC ${FCOPTS})
135+
install(TARGETS csv_write_test)
135136

136137
add_executable(csv_read_test "${TEST_SOURCE_DIR}/csv_read_test.f90")
137138
target_link_libraries(csv_read_test ${LIBFCSV_NAME})
138139
target_compile_options(csv_read_test PUBLIC ${FCOPTS})
140+
install(TARGETS csv_read_test)
139141

140-
add_executable(csv_test "${TEST_SOURCE_DIR}/csv_local_test.f90")
142+
add_executable(csv_local_test "${TEST_SOURCE_DIR}/csv_local_test.f90")
143+
target_link_libraries(csv_local_test ${LIBFCSV_NAME})
144+
target_compile_options(csv_local_test PUBLIC ${FCOPTS})
145+
install(TARGETS csv_local_test)
146+
147+
add_executable(csv_test "${TEST_SOURCE_DIR}/csv_test.f90")
141148
target_link_libraries(csv_test ${LIBFCSV_NAME})
142149
target_compile_options(csv_test PUBLIC ${FCOPTS})
150+
install(TARGETS csv_test)
143151

144152
set_target_properties(
145-
csv_write_test csv_read_test csv_test
153+
csv_write_test csv_read_test csv_local_test csv_test
146154
PROPERTIES
147155
Fortran_MODULE_DIRECTORY ${LIBFCSV_FORTRAN_MODULE_DIR}
148156
)
149157

158+
150159
###############################################################################
151160
## Testing ####################################################################
152161
###############################################################################
@@ -156,14 +165,14 @@ set(TEST_DIR "${CMAKE_CURRENT_BINARY_DIR}/test")
156165
# Create test output as separate target folded into `make all`
157166
add_custom_target(pretest_setup
158167
ALL
159-
DEPENDS csv_test
168+
DEPENDS csv_local_test
160169
COMMAND ${CMAKE_COMMAND} -E echo "Copying test and reference data"
161170
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/files" "${TEST_DIR}"
162171
VERBATIM
163172
USES_TERMINAL
164173
)
165174

166-
# Create csv_test output as separate target folded into `make all`
175+
# Create csv_write_test output as separate target folded into `make all`
167176
add_custom_target(run_csv_write_test
168177
ALL
169178
DEPENDS pretest_setup
@@ -187,12 +196,12 @@ add_custom_target(run_csv_read_test
187196
USES_TERMINAL
188197
)
189198

190-
# Create csv_test output as separate target folded into `make all`
191-
add_custom_target(run_csv_test
199+
# Create csv_local_test output as separate target folded into `make all`
200+
add_custom_target(run_csv_local_test
192201
ALL
193202
DEPENDS pretest_setup
194-
COMMAND ${CMAKE_COMMAND} -E echo "Running csv_test"
195-
COMMAND $<TARGET_FILE:csv_test> > csv_test.out
203+
COMMAND ${CMAKE_COMMAND} -E echo "Running csv_local_test"
204+
COMMAND $<TARGET_FILE:csv_local_test> > csv_test.out
196205
BYPRODUCTS csv_test.out test2.csv
197206
WORKING_DIRECTORY "${TEST_DIR}"
198207
VERBATIM
@@ -202,7 +211,7 @@ add_custom_target(run_csv_test
202211
# ***** Integral Tests *****
203212

204213
# Tests using CMake's simple built-in "compare_files" command
205-
# Compare output and reformatted original reference data
214+
# Compare output with original reference data
206215

207216
# Example 1: csv_read_test.out
208217
add_test(NAME 1_csv_read_test
@@ -237,7 +246,7 @@ set_tests_properties(
237246
DEPENDS pretest_setup
238247
DEPENDS run_csv_write_test
239248
DEPENDS run_csv_read_test
240-
DEPENDS run_csv_test
249+
DEPENDS run_csv_local_test
241250
WORKING_DIRECTORY "${TEST_DIR}"
242251
TIMEOUT 30
243252
)

0 commit comments

Comments
 (0)