work with visual studio generator: separate C, Fortran objects

Author: scivision

test/array/CMakeLists.txt

@@ -4,6 +4,13 @@ add_executable(cxx_f_array main.cpp)
 target_link_libraries(cxx_f_array PRIVATE vector_fortran)
 add_test(NAME CPP_array COMMAND cxx_f_array)
 
-add_executable(fortran_cpp_array array.f90 lib.c lib.cpp)
-set_property(TARGET fortran_cpp_array PROPERTY LINKER_LANGUAGE Fortran)
+
+# object library to work with Visual Studio generator
+add_library(fortran_array OBJECT array.f90)
+
+add_executable(fortran_cpp_array lib.c lib.cpp $<TARGET_OBJECTS:fortran_array>)
+if(NOT CMAKE_GENERATOR MATCHES "Visual Studio")
+  set_property(TARGET fortran_cpp_array PROPERTY LINKER_LANGUAGE Fortran)
+endif()
+
 add_test(NAME Fortran_CPP_array COMMAND fortran_cpp_array)

test/pointer/CMakeLists.txt

@@ -18,10 +18,14 @@ add_executable(cxx_fortran_pointer main.cpp)
 target_link_libraries(cxx_fortran_pointer PRIVATE pointer_fortran)
 add_test(NAME C++_Fortran_pointer COMMAND cxx_fortran_pointer)
 
-add_executable(fortran_cxx_null null_c.f90 ${PROJECT_SOURCE_DIR}/src/pointer/null.cpp)
+add_library(cpp_null OBJECT ${PROJECT_SOURCE_DIR}/src/pointer/null.cpp)
+add_executable(fortran_cxx_null null_c.f90 $<TARGET_OBJECTS:cpp_null>)
+set_property(TARGET fortran_cxx_null PROPERTY LINKER_LANGUAGE Fortran)
 add_test(NAME Fortran_C++_null COMMAND fortran_cxx_null)
 
-add_executable(fortran_c_null null_c.f90 ${PROJECT_SOURCE_DIR}/src/pointer/null.c)
+# for Visual Studio generator object library
+add_library(c_null OBJECT ${PROJECT_SOURCE_DIR}/src/pointer/null.c)
+add_executable(fortran_c_null null_c.f90 $<TARGET_OBJECTS:c_null>)
 add_test(NAME Fortran_C_null COMMAND fortran_c_null)
 
 set_property(TARGET fortran_c_null fortran_cxx_null PROPERTY LINKER_LANGUAGE Fortran)

test/pointer/null_c.f90

@@ -1,4 +1,4 @@
-program Null_C
+program main
 
 use, intrinsic :: iso_c_binding, only : C_PTR, c_associated, C_NULL_CHAR, C_CHAR
 

test/string/CMakeLists.txt

@@ -13,6 +13,7 @@ add_test(NAME string_cpp COMMAND string_cpp)
 # single C_CHAR -- fails on nvfortran
 # https://forums.developer.nvidia.com/t/nvfortran-iso-c-binding-with-single-char/284098
 
-add_executable(single_char main_char.f90 lib_char.c)
+add_library(c_char OBJECT lib_char.c)
+add_executable(single_char main_char.f90 $<TARGET_OBJECTS:c_char>)
 set_property(TARGET single_char PROPERTY LINKER_LANGUAGE Fortran)
 add_test(NAME single_char COMMAND single_char)

test/struct/CMakeLists.txt

@@ -21,6 +21,7 @@ target_link_libraries(fortran_cxx_struct PRIVATE struct_cpp)
 set_property(TARGET fortran_cxx_struct PROPERTY LINKER_LANGUAGE Fortran)
 add_test(NAME Fortran_C++_struct COMMAND fortran_cxx_struct)
 
-add_executable(binding_derived derived.f90 main_derived.c)
+add_library(fortran_derived OBJECT derived.f90)
+add_executable(binding_derived main_derived.c $<TARGET_OBJECTS:fortran_derived>)
 set_property(TARGET binding_derived PROPERTY LINKER_LANGUAGE C)
 add_test(NAME binding_derived COMMAND binding_derived)

test/time/CMakeLists.txt

@@ -1,6 +1,7 @@
 set_property(DIRECTORY PROPERTY LABELS time)
 
-add_executable(cxx_fortran_tictoc main.cpp clock.f90)
+add_library(fortran_clock OBJECT clock.f90)
+add_executable(cxx_fortran_tictoc main.cpp $<TARGET_OBJECTS:fortran_clock>)
 add_test(NAME C++_Fortran_tictoc COMMAND cxx_fortran_tictoc)
 
 file(READ strftime.f90 src)
@@ -19,7 +20,10 @@ endforeach()
 file(READ strptime.f90 src)
 check_source_compiles(Fortran "${src}" HAVE_C_STRPTIME)
 
-target_sources(strptime PRIVATE "$<$<NOT:$<BOOL:${HAVE_C_STRPTIME}>>:strptime.cpp>")
+if(NOT HAVE_C_STRPTIME)
+  add_library(cpp_strptime OBJECT strptime.cpp)
+  target_sources(strptime PRIVATE $<TARGET_OBJECTS:cpp_strptime>)
+endif()
 
 if(TARGET strftime)
   target_link_libraries(strftime PRIVATE "$<$<BOOL:${MINGW}>:ucrtbase>")

test/vector/CMakeLists.txt

@@ -8,10 +8,11 @@ target_link_libraries(cxx_fortran_vector PRIVATE vector_fortran)
 
 add_test(NAME C++_Fortran_vector COMMAND cxx_fortran_vector)
 
-add_executable(fortran_cxx_vector vector.f90
+add_library(cpp_vector OBJECT
 ${PROJECT_SOURCE_DIR}/src/vector/lib.c
 ${PROJECT_SOURCE_DIR}/src/vector/lib.cpp
 )
+add_executable(fortran_cxx_vector vector.f90 $<TARGET_OBJECTS:cpp_vector>)
 # LINKER_LANGUAGE needed for Linux oneAPI
 set_property(TARGET fortran_cxx_vector PROPERTY LINKER_LANGUAGE Fortran)
 add_test(NAME Fortran_C++_vector COMMAND fortran_cxx_vector)