From fc4d4ff59b0f9512d30f948976b1a8c73bdcefb4 Mon Sep 17 00:00:00 2001 From: Simon Maertens Date: Fri, 5 Aug 2022 10:49:21 +0200 Subject: [PATCH 1/2] Propagate Fortran flags as well as linker flags to the time check subproject. Enable verbose output (will only show in the log files). Bit of formatting. --- CMAKE/CheckTimeFunction.cmake | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/CMAKE/CheckTimeFunction.cmake b/CMAKE/CheckTimeFunction.cmake index d94c8a4006..2399684fc1 100644 --- a/CMAKE/CheckTimeFunction.cmake +++ b/CMAKE/CheckTimeFunction.cmake @@ -7,24 +7,25 @@ macro(CHECK_TIME_FUNCTION FUNCTION VARIABLE) - try_compile(RES + try_compile(RES ${PROJECT_BINARY_DIR}/INSTALL ${PROJECT_SOURCE_DIR}/INSTALL TIMING secondtst_${FUNCTION} CMAKE_FLAGS -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET} + -DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS} + -DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS} + -DCMAKE_VERBOSE_MAKEFILE=ON OUTPUT_VARIABLE OUTPUT) - if(RES) - set(${VARIABLE} ${FUNCTION} CACHE INTERNAL "Have Fortran function ${FUNCTION}") - message(STATUS "Looking for Fortran ${FUNCTION} - found") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Fortran ${FUNCTION} exists. ${OUTPUT} \n\n") - else() - message(STATUS "Looking for Fortran ${FUNCTION} - not found") - file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Fortran ${FUNCTION} does not exist. \n ${OUTPUT} \n") - endif() + if(RES) + set(${VARIABLE} ${FUNCTION} CACHE INTERNAL "Have Fortran function ${FUNCTION}") + message(STATUS "Looking for Fortran ${FUNCTION} - found") + file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Fortran ${FUNCTION} exists. ${OUTPUT} \n\n") + else() + message(STATUS "Looking for Fortran ${FUNCTION} - not found") + file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Fortran ${FUNCTION} does not exist. \n ${OUTPUT} \n") + endif() endmacro() - - From 4c189dd8fce13022fc8a41bedb985fc73c022748 Mon Sep 17 00:00:00 2001 From: Simon Maertens Date: Fri, 5 Aug 2022 11:02:36 +0200 Subject: [PATCH 2/2] Fixed default value for TIME_FUNC. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3505b81b8b..41b3c138cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,7 +257,7 @@ CheckLAPACKCompilerFlags() # Check second function include(CheckTimeFunction) -set(NONE ${TIME_FUNC}) +set(TIME_FUNC NONE) CHECK_TIME_FUNCTION(NONE TIME_FUNC) CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC) CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)