echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests/FortranModules: Simplify check for submodules support

Browse Source
This commit is contained in:
Brad King 2025-03-12 16:28:52 -04:00
parent 2c28321adb
commit fa4ac78f4a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/CMakeLists.txt
View File

@ -3260,6 +3260,9 @@ if(BUILD_TESTING)
# FIXME(lfortran): The compiler fails on the test's modules. # FIXME(lfortran): The compiler fails on the test's modules.
AND NOT CMAKE_Fortran_COMPILER_ID STREQUAL "LFortran" AND NOT CMAKE_Fortran_COMPILER_ID STREQUAL "LFortran"
) )
if(DEFINED CMake_TEST_Fortran_SUBMODULES)
list(PREPEND CMake_TEST_FortranModules_BUILD_OPTIONS -DCMake_TEST_Fortran_SUBMODULES:BOOL=${CMake_TEST_Fortran_SUBMODULES})
endif()
add_test(FortranModules ${CMAKE_CTEST_COMMAND} add_test(FortranModules ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/FortranModules" "${CMake_SOURCE_DIR}/Tests/FortranModules"
@ -3268,7 +3271,6 @@ if(BUILD_TESTING)
--build-project FortranModules --build-project FortranModules
--build-options --build-options
-DCMake_TEST_NESTED_MAKE_PROGRAM:FILEPATH=${CMake_TEST_EXPLICIT_MAKE_PROGRAM} -DCMake_TEST_NESTED_MAKE_PROGRAM:FILEPATH=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-DCMake_TEST_Fortran_SUBMODULES:BOOL=${CMake_TEST_Fortran_SUBMODULES}
${CMake_TEST_FortranModules_BUILD_OPTIONS} ${CMake_TEST_FortranModules_BUILD_OPTIONS}
) )
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/FortranModules") list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/FortranModules")

4
Tests/FortranModules/CMakeLists.txt
View File

@ -10,9 +10,7 @@ if(NOT DEFINED CMake_TEST_NESTED_MAKE_PROGRAM AND NOT CMAKE_GENERATOR MATCHES "V
set(CMake_TEST_NESTED_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}") set(CMake_TEST_NESTED_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}")
endif() endif()
if("x${CMake_TEST_Fortran_SUBMODULES}" STREQUAL "x" if(NOT DEFINED CMake_TEST_Fortran_SUBMODULES)
AND NOT CMAKE_VERSION VERSION_LESS 3.6.20160923 # for CheckFortranSourceCompiles SRC_EXT
)
include(CheckFortranSourceCompiles) include(CheckFortranSourceCompiles)
CHECK_Fortran_SOURCE_COMPILES([[ CHECK_Fortran_SOURCE_COMPILES([[
module parent module parent