Fix Cmake path for .mod files.

Goddard-Fortran-Ecosystem · Mar 24, 2021 · ade7237 · ade7237
1 parent 859f84d
commit ade7237
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -79,7 +79,7 @@ install (
   DESTINATION ${top_dir}/cmake
   )
 
-configure_file(GFTL.mk.in ${CMAKE_CURRENT_BINARY_DIR}/GFTL.mk @ONLY)
+configure_file(cmake/GFTL.mk.in ${CMAKE_CURRENT_BINARY_DIR}/GFTL.mk @ONLY)
 install (
   FILES ${CMAKE_CURRENT_BINARY_DIR}/GFTL.mk 
   DESTINATION "${top_dir}/include"

diff --git a/cmake/tmpGFTL.mk.in → cmake/GFTL.mk.in b/cmake/tmpGFTL.mk.in → cmake/GFTL.mk.in
diff --git a/cmake/tmpGFTLConfig.cmake.in → cmake/GFTLConfig.cmake.in b/cmake/tmpGFTLConfig.cmake.in → cmake/GFTLConfig.cmake.in
diff --git a/tests/deque/CMakeLists.txt b/tests/deque/CMakeLists.txt
@@ -49,7 +49,6 @@ foreach (T ${types})
     OTHER_SOURCES ${other_sources}
     LINK_LIBRARIES gftl-v2
     )
-  set_target_properties (${test}.x PROPERTIES Fortran_MODULE_DIRECTORY ${test}/mod)
   add_dependencies (tests ${test}.x)
 
 endforeach ()

diff --git a/tests/map/CMakeLists.txt b/tests/map/CMakeLists.txt
@@ -53,7 +53,6 @@ foreach (key ${keys})
       OTHER_SOURCES ${other_sources}
       LINK_LIBRARIES gftl-v2
       )
-    set_target_properties (test_${key}${T}_map.x PROPERTIES Fortran_MODULE_DIRECTORY test_${key}${T}_map/mod)
     add_dependencies (tests test_${key}${T}_map.x)
 
   endforeach ()

diff --git a/tests/ordered_map/CMakeLists.txt b/tests/ordered_map/CMakeLists.txt
@@ -54,7 +54,6 @@ foreach (key ${keys})
       OTHER_SOURCES ${other_sources}
       LINK_LIBRARIES gftl-v2
       )
-    set_target_properties (test_${key}${T}_ordered_map.x PROPERTIES Fortran_MODULE_DIRECTORY test_${key}${T}_ordered_map/mod)
     add_dependencies (tests test_${key}${T}_ordered_map.x)
 
   endforeach ()

diff --git a/tests/queue/CMakeLists.txt b/tests/queue/CMakeLists.txt
@@ -45,7 +45,6 @@ foreach (T ${types})
     OTHER_SOURCES ${other_sources}
     LINK_LIBRARIES gftl-v2
     )
-  set_target_properties (${test}.x PROPERTIES Fortran_MODULE_DIRECTORY ${test}/mod)
   add_dependencies (tests ${test}.x)
 
 endforeach ()

diff --git a/tests/set/CMakeLists.txt b/tests/set/CMakeLists.txt
@@ -44,7 +44,6 @@ foreach (T ${types})
     OTHER_SOURCES ${other_sources}
     LINK_LIBRARIES gftl-v2
     )
-  set_target_properties (test_${T}_set.x PROPERTIES Fortran_MODULE_DIRECTORY test_${T}_set/mod)
 
   add_dependencies (tests test_${T}_set.x)
 

diff --git a/tests/stack/CMakeLists.txt b/tests/stack/CMakeLists.txt
@@ -45,7 +45,6 @@ foreach (T ${types})
     OTHER_SOURCES ${other_sources}
     LINK_LIBRARIES gftl-v2
     )
-  set_target_properties (${test}.x PROPERTIES Fortran_MODULE_DIRECTORY ${test}/mod)
   add_dependencies (tests ${test}.x)
 
 endforeach ()

diff --git a/tests/vector/CMakeLists.txt b/tests/vector/CMakeLists.txt
@@ -56,7 +56,6 @@ foreach (T ${types})
     OTHER_SOURCES ${other_sources}
     LINK_LIBRARIES gftl-v2
     )
-  set_target_properties (${test}.x PROPERTIES Fortran_MODULE_DIRECTORY ${test}/mod)
 
   add_dependencies (tests ${test}.x)