rearrange dirs

Author: scivision

CMakeLists.txt

@@ -29,28 +29,9 @@ include(CTest)
 
 include (cmake/compilers.cmake)
 
-set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_C_STANDARD 99)
+set(CMAKE_CXX_STANDARD 11)
 
-add_library(c_lib call_c.c)
-
-add_executable(f_call_c f_call_c.f90 $<TARGET_OBJECTS:c_lib>)
-add_test(NAME FortranCallC COMMAND f_call_c)
-
-# -- C++ calling Fortran
-add_library(call_f OBJECT c_call_f.f90)
-
-add_executable(cxx_call_f cxx_call_f.cxx $<TARGET_OBJECTS:call_f>)
-add_test(NAME CXXCallFortran COMMAND cxx_call_f)
-
-# -- Fortran calling C++
-add_library(cxx_lib OBJECT call_cxx.cxx)
-
-add_executable(f_call_cxx f_call_c.f90 $<TARGET_OBJECTS:cxx_lib>)
-# LINKER_LANGUAGE option is necessary for ifort at least
-set_target_properties(f_call_cxx PROPERTIES LINKER_LANGUAGE Fortran)
-add_test(NAME FortranCallC++ COMMAND f_call_cxx)
+add_subdirectory(c)
 
-set_tests_properties(FortranCallC CXXCallFortran FortranCallC++
-PROPERTIES
-TIMEOUT 5)
+add_subdirectory(cxx)

CMakePresets.json

@@ -14,7 +14,6 @@
   "displayName": "Intel oneAPI LLVM",
   "environment": {
     "CC": "icx",
-    "CXX": "icx",
     "FC": "ifx"
   }
 }

c/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_library(c_lib call_c.c)
+
+add_executable(f_call_c ${PROJECT_SOURCE_DIR}/f_call_c.f90 $<TARGET_OBJECTS:c_lib>)
+add_test(NAME FortranCallC COMMAND f_call_c)
+
+set_tests_properties(FortranCallC
+PROPERTIES
+TIMEOUT 5)

call_c.c renamed to c/call_c.c

@@ -0,0 +1,7 @@
+c_lib = library('call_c', 'call_c.c')
+
+f_call_c = executable('f_call_c', fcc_src,
+  link_with: c_lib,
+  link_language: 'fortran')
+
+test('Fortran calling C', f_call_c,  timeout: 10)

c/meson.build

@@ -0,0 +1,17 @@
+# -- C++ calling Fortran
+add_library(call_f OBJECT c_call_f.f90)
+
+add_executable(cxx_call_f cxx_call_f.cxx $<TARGET_OBJECTS:call_f>)
+add_test(NAME CXXCallFortran COMMAND cxx_call_f)
+
+# -- Fortran calling C++
+add_library(cxx_lib OBJECT call_cxx.cxx)
+
+add_executable(f_call_cxx ${PROJECT_SOURCE_DIR}/f_call_c.f90 $<TARGET_OBJECTS:cxx_lib>)
+# LINKER_LANGUAGE option is necessary for ifort at least
+set_target_properties(f_call_cxx PROPERTIES LINKER_LANGUAGE Fortran)
+add_test(NAME FortranCallC++ COMMAND f_call_cxx)
+
+set_tests_properties(CXXCallFortran FortranCallC++
+PROPERTIES
+TIMEOUT 5)

cxx/CMakeLists.txt

@@ -0,0 +1,9 @@
+call_f = library('call_f', 'c_call_f.f90')
+c_call_f = executable('c_call_f', 'cxx_call_f.cxx', link_with: call_f)
+test('C++ calling Fortran', c_call_f, timeout: 10)
+
+cxx_lib = library('call_cxx', 'call_cxx.cxx')
+f_call_cxx = executable('f_call_cxx', fcc_src,
+  link_with: cxx_lib,
+  link_language: 'fortran')
+test('Fortran calling C++', f_call_cxx, timeout: 10)