Skip to content

Commit 2855524

Browse files
authored
Merge pull request #162 from OpenMS/fix_eigen
Hopefully fix eigen building on windows
2 parents be8c14f + ad77f2c commit 2855524

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

libraries.cmake/eigen.cmake

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,25 @@ macro( OPENMS_CONTRIB_BUILD_EIGEN )
2525
message(STATUS " Source dir: ${EIGEN_DIR}")
2626
message(STATUS " Build dir: ${_EIGEN_NATIVE_BUILD_DIR}")
2727

28+
# Use CMAKE_COMMAND to create an empty file for stdin redirection
29+
# This prevents child processes from inheriting stdin (which changed from exec_program to execute_process)
30+
set(_EIGEN_NULL_INPUT "${_EIGEN_BUILD_DIR}/null_input.txt")
31+
file(WRITE "${_EIGEN_NULL_INPUT}" "")
32+
2833
execute_process(COMMAND ${CMAKE_COMMAND}
2934
-G "${CMAKE_GENERATOR}"
3035
${ARCHITECTURE_OPTION_CMAKE}
3136
-D CMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}
3237
-D BUILD_TESTING:BOOL=OFF
3338
-D EIGEN_TEST_NOQT=ON
39+
-D CMAKE_Fortran_COMPILER=NOTFOUND
3440
${EIGEN_DIR}
3541
WORKING_DIRECTORY ${_EIGEN_NATIVE_BUILD_DIR}
42+
INPUT_FILE ${_EIGEN_NULL_INPUT}
3643
OUTPUT_VARIABLE _EIGEN_CMAKE_OUT
3744
ERROR_VARIABLE _EIGEN_CMAKE_ERR
3845
RESULT_VARIABLE _EIGEN_CMAKE_SUCCESS
39-
TIMEOUT 300)
46+
TIMEOUT 600)
4047

4148
# output to logfile
4249
file(APPEND ${LOGFILE} ${_EIGEN_CMAKE_OUT})
@@ -62,8 +69,7 @@ macro( OPENMS_CONTRIB_BUILD_EIGEN )
6269
WORKING_DIRECTORY ${_EIGEN_NATIVE_BUILD_DIR}
6370
OUTPUT_VARIABLE _EIGEN_BUILD_OUT
6471
ERROR_VARIABLE _EIGEN_BUILD_ERR
65-
RESULT_VARIABLE _EIGEN_BUILD_SUCCESS
66-
TIMEOUT 300)
72+
RESULT_VARIABLE _EIGEN_BUILD_SUCCESS)
6773

6874
# output to logfile
6975
file(APPEND ${LOGFILE} ${_EIGEN_BUILD_OUT})

0 commit comments

Comments
 (0)