diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2023-09-18 23:41:47 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2023-09-18 23:41:47 (GMT) |
| commit | 45513c1a69853372a1abf137adea262e5df7df71 (patch) | |
| tree | e440a15251b612bf34f1d9186bcdd4f51b03a1fc | |
| parent | 7d3b4868d0306d4fcc430349241b5b78f76d543c (diff) | |
| download | CMake-45513c1a69853372a1abf137adea262e5df7df71.zip CMake-45513c1a69853372a1abf137adea262e5df7df71.tar.gz CMake-45513c1a69853372a1abf137adea262e5df7df71.tar.bz2 | |
Tests/FortranModules: move issue 25112 fix from FortranOnly
It involves modules, so it belongs in the `FortranModules` test set.
| -rw-r--r-- | Tests/FortranModules/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/FortranModules/Issue25112/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/FortranModules/Issue25112/objmain.f90 (renamed from Tests/FortranOnly/objmain.f90) | 0 | ||||
| -rw-r--r-- | Tests/FortranModules/Issue25112/objmod.f90 (renamed from Tests/FortranOnly/objmod.f90) | 0 | ||||
| -rw-r--r-- | Tests/FortranOnly/CMakeLists.txt | 6 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Tests/FortranModules/CMakeLists.txt b/Tests/FortranModules/CMakeLists.txt index 5c76132..487491f 100644 --- a/Tests/FortranModules/CMakeLists.txt +++ b/Tests/FortranModules/CMakeLists.txt @@ -125,3 +125,5 @@ add_subdirectory(Executable) if(CMake_TEST_Fortran_SUBMODULES) add_subdirectory(Submodules) endif() + +add_subdirectory(Issue25112) diff --git a/Tests/FortranModules/Issue25112/CMakeLists.txt b/Tests/FortranModules/Issue25112/CMakeLists.txt new file mode 100644 index 0000000..cf0c69e --- /dev/null +++ b/Tests/FortranModules/Issue25112/CMakeLists.txt @@ -0,0 +1,4 @@ +set(CMAKE_Fortran_MODULE_DIRECTORY "${PROJECT_BINARY_DIR}/include") +add_library(objmod OBJECT objmod.f90) +add_executable(objmain objmain.f90) +target_link_libraries(objmain PRIVATE objmod) diff --git a/Tests/FortranOnly/objmain.f90 b/Tests/FortranModules/Issue25112/objmain.f90 index d41d454..d41d454 100644 --- a/Tests/FortranOnly/objmain.f90 +++ b/Tests/FortranModules/Issue25112/objmain.f90 diff --git a/Tests/FortranOnly/objmod.f90 b/Tests/FortranModules/Issue25112/objmod.f90 index 6b79cc7..6b79cc7 100644 --- a/Tests/FortranOnly/objmod.f90 +++ b/Tests/FortranModules/Issue25112/objmod.f90 diff --git a/Tests/FortranOnly/CMakeLists.txt b/Tests/FortranOnly/CMakeLists.txt index dfc28dd..02bf2b8 100644 --- a/Tests/FortranOnly/CMakeLists.txt +++ b/Tests/FortranOnly/CMakeLists.txt @@ -186,9 +186,3 @@ if(CMAKE_Fortran_COMPILE_OPTIONS_PREPROCESS_OFF AND set_property(SOURCE no_preprocess_source_upper.F no_preprocess_source_fpp.fpp PROPERTY Fortran_PREPROCESS OFF) endif() - -# Issue 25112 -set(CMAKE_Fortran_MODULE_DIRECTORY "${PROJECT_BINARY_DIR}/include") -add_library(objmod OBJECT objmod.f90) -add_executable(objmain objmain.f90) -target_link_libraries(objmain PRIVATE objmod) |