@@ -132,21 +132,30 @@ set(TEST_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/tests")
132
132
add_executable (csv_write_test "${TEST_SOURCE_DIR} /csv_write_test.f90" )
133
133
target_link_libraries (csv_write_test ${LIBFCSV_NAME} )
134
134
target_compile_options (csv_write_test PUBLIC ${FCOPTS} )
135
+ install (TARGETS csv_write_test )
135
136
136
137
add_executable (csv_read_test "${TEST_SOURCE_DIR} /csv_read_test.f90" )
137
138
target_link_libraries (csv_read_test ${LIBFCSV_NAME} )
138
139
target_compile_options (csv_read_test PUBLIC ${FCOPTS} )
140
+ install (TARGETS csv_read_test )
139
141
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" )
141
148
target_link_libraries (csv_test ${LIBFCSV_NAME} )
142
149
target_compile_options (csv_test PUBLIC ${FCOPTS} )
150
+ install (TARGETS csv_test )
143
151
144
152
set_target_properties (
145
- csv_write_test csv_read_test csv_test
153
+ csv_write_test csv_read_test csv_local_test csv_test
146
154
PROPERTIES
147
155
Fortran_MODULE_DIRECTORY ${LIBFCSV_FORTRAN_MODULE_DIR}
148
156
)
149
157
158
+
150
159
###############################################################################
151
160
## Testing ####################################################################
152
161
###############################################################################
@@ -156,14 +165,14 @@ set(TEST_DIR "${CMAKE_CURRENT_BINARY_DIR}/test")
156
165
# Create test output as separate target folded into `make all`
157
166
add_custom_target (pretest_setup
158
167
ALL
159
- DEPENDS csv_test
168
+ DEPENDS csv_local_test
160
169
COMMAND ${CMAKE_COMMAND} -E echo "Copying test and reference data"
161
170
COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR} /files" "${TEST_DIR} "
162
171
VERBATIM
163
172
USES_TERMINAL
164
173
)
165
174
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`
167
176
add_custom_target (run_csv_write_test
168
177
ALL
169
178
DEPENDS pretest_setup
@@ -187,12 +196,12 @@ add_custom_target(run_csv_read_test
187
196
USES_TERMINAL
188
197
)
189
198
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
192
201
ALL
193
202
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
196
205
BYPRODUCTS csv_test.out test2.csv
197
206
WORKING_DIRECTORY "${TEST_DIR} "
198
207
VERBATIM
@@ -202,7 +211,7 @@ add_custom_target(run_csv_test
202
211
# ***** Integral Tests *****
203
212
204
213
# 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
206
215
207
216
# Example 1: csv_read_test.out
208
217
add_test (NAME 1_csv_read_test
@@ -237,7 +246,7 @@ set_tests_properties(
237
246
DEPENDS pretest_setup
238
247
DEPENDS run_csv_write_test
239
248
DEPENDS run_csv_read_test
240
- DEPENDS run_csv_test
249
+ DEPENDS run_csv_local_test
241
250
WORKING_DIRECTORY "${TEST_DIR} "
242
251
TIMEOUT 30
243
252
)
0 commit comments