Skip to content

Commit 801ac2f

Browse files
authored
Merge pull request #696 from ACSimon33/time_check_flag_propagation
Time check flag propagation and default value.
2 parents be3a076 + 4c189dd commit 801ac2f

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

CMAKE/CheckTimeFunction.cmake

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,25 @@
77

88
macro(CHECK_TIME_FUNCTION FUNCTION VARIABLE)
99

10-
try_compile(RES
10+
try_compile(RES
1111
${PROJECT_BINARY_DIR}/INSTALL
1212
${PROJECT_SOURCE_DIR}/INSTALL
1313
TIMING secondtst_${FUNCTION}
1414
CMAKE_FLAGS
1515
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
16+
-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}
17+
-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}
18+
-DCMAKE_VERBOSE_MAKEFILE=ON
1619
OUTPUT_VARIABLE OUTPUT)
1720

18-
if(RES)
19-
set(${VARIABLE} ${FUNCTION} CACHE INTERNAL "Have Fortran function ${FUNCTION}")
20-
message(STATUS "Looking for Fortran ${FUNCTION} - found")
21-
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
22-
"Fortran ${FUNCTION} exists. ${OUTPUT} \n\n")
23-
else()
24-
message(STATUS "Looking for Fortran ${FUNCTION} - not found")
25-
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
26-
"Fortran ${FUNCTION} does not exist. \n ${OUTPUT} \n")
27-
endif()
21+
if(RES)
22+
set(${VARIABLE} ${FUNCTION} CACHE INTERNAL "Have Fortran function ${FUNCTION}")
23+
message(STATUS "Looking for Fortran ${FUNCTION} - found")
24+
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
25+
"Fortran ${FUNCTION} exists. ${OUTPUT} \n\n")
26+
else()
27+
message(STATUS "Looking for Fortran ${FUNCTION} - not found")
28+
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
29+
"Fortran ${FUNCTION} does not exist. \n ${OUTPUT} \n")
30+
endif()
2831
endmacro()
29-
30-

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ CheckLAPACKCompilerFlags()
257257
# Check second function
258258

259259
include(CheckTimeFunction)
260-
set(NONE ${TIME_FUNC})
260+
set(TIME_FUNC NONE)
261261
CHECK_TIME_FUNCTION(NONE TIME_FUNC)
262262
CHECK_TIME_FUNCTION(INT_CPU_TIME TIME_FUNC)
263263
CHECK_TIME_FUNCTION(EXT_ETIME TIME_FUNC)

0 commit comments

Comments
 (0)