use correct options

Author: scivision

array/CMakeLists.txt

@@ -1,8 +1,8 @@
 add_executable(rotflip test_rot90.f90 rot90.f90)
-add_test(NAME array:RotFlip COMMAND $<TARGET_FILE:rotflip>)
+add_test(NAME array:RotFlip COMMAND rotflip)
 
 add_executable(auto_allocate_array auto_allocate.f90)
-add_test(NAME array:AutoAllocate COMMAND $<TARGET_FILE:auto_allocate_array>)
+add_test(NAME array:AutoAllocate COMMAND auto_allocate_array)
 
 if(f18assumed_rank)
   add_executable(assumed_rank assumed-rank.f90)

cmake/compilers.cmake

@@ -16,7 +16,6 @@ endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/f18abstract.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/f18impnone.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/f08block.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/f08contig.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/f18errorstop.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/f18random.cmake)

debug/CMakeLists.txt

@@ -1,7 +1,5 @@
 add_executable(badbounds badbounds.f90)
-if(CMAKE_Fortran_COMPILER_ID STREQUAL GCC)
-  target_compile_options(badbounds PRIVATE -fcheck=bounds)
-endif()
+target_compile_options(badbounds PRIVATE $<$<Fortran_COMPILER_ID:GNU>:-fcheck=bounds>)
 
 add_executable(nanmaxmin maxmin_nan.f90)
 add_test(NAME debug:NaNminmax COMMAND nanmaxmin)

git/CMakeLists.txt

@@ -30,6 +30,6 @@ endif()
 message(STATUS "${PROJECT_NAME}  git revision: ${git_rev}  git_branch: ${git_branch}  git_porcelain: ${git_porcelain}")
 
 # example
-configure_file(main.in.f90 main.f90)
+configure_file(main.in.f90 main.f90 @ONLY)
 add_executable(git_rev ${CMAKE_CURRENT_BINARY_DIR}/main.f90)
 add_test(NAME git:revision COMMAND $<TARGET_FILE:git_rev>)

random/CMakeLists.txt

@@ -1,8 +1,5 @@
 
-add_executable(random random.f90 random_demo.f90)
+add_executable(random random.f90 random_demo.f90
+$<IF:$<BOOL:${f18random}>,random_init_f2018.f90,random_init.f90>
+)
 add_test(NAME RandomInit COMMAND random)
-if(f18random)
-  target_sources(random PRIVATE random_init_f2018.f90)
-else()
-  target_sources(random PRIVATE random_init.f90)
-endif()

real/CMakeLists.txt

@@ -16,19 +16,19 @@ endif()
 set(real_prec "integer,parameter :: wp=real${realbits}")
 
 add_executable(cast_int2real cast_int2real.f90)
-add_test(NAME real:cast_int2real COMMAND $<TARGET_FILE:cast_int2real>)
+add_test(NAME real:cast_int2real COMMAND cast_int2real)
 
-configure_file(polymorphic.in.f90 polymorphic.f90)
+configure_file(polymorphic.in.f90 polymorphic.f90 @ONLY)
 add_executable(polymorph ${CMAKE_CURRENT_BINARY_DIR}/polymorphic.f90)
-add_test(NAME real:polymorphic COMMAND $<TARGET_FILE:polymorph>)
+add_test(NAME real:polymorphic COMMAND polymorph)
 
 add_executable(epsilon epsilon.f90)
-add_test(NAME real:epsilon COMMAND $<TARGET_FILE:epsilon>)
+add_test(NAME real:epsilon COMMAND epsilon)
 
 if(f08kind)
 
   add_executable(coerce coerce.f90)
-  add_test(NAME real:coerce COMMAND $<TARGET_FILE:coerce>)
+  add_test(NAME real:coerce COMMAND coerce)
 
   add_executable(divprec div_precision.f90)
   add_test(NAME real:divisionPrecision COMMAND divprec)