diff options
| author |  Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2015-08-14 15:30:59 +0200 |
|---|---|---|
| committer | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2015-08-14 15:30:59 +0200 |
| commit | a5d1bb2be8340e446d6f8ce24e0b1a8987e9be95 (patch) | |
| tree | 8b1a5a1a1ebd1753180f05d5e10e5d6359412dee /cmake | |
| parent | cac6b23033807187382a5ace7d49d39a3436fe1b (diff) | |
bug #1054: Use set(EIGEN_CXX_FLAG_VERSION "/version") only for Intel compilers on Windows.
Also removed code calling `head -n1` and always use integrated REGEX functionality.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/EigenTesting.cmake | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake index 0774b5d81..5022397a7 100644 --- a/cmake/EigenTesting.cmake +++ b/cmake/EigenTesting.cmake @@ -367,23 +367,15 @@ macro(ei_get_compilerver VAR) # on all other system we rely on ${CMAKE_CXX_COMPILER} # supporting a "--version" or "/version" flag - if(WIN32 AND NOT CYGWIN AND NOT MINGW) + if(WIN32 AND ${CMAKE_CXX_COMPILER_ID} EQUAL "Intel") set(EIGEN_CXX_FLAG_VERSION "/version") else() set(EIGEN_CXX_FLAG_VERSION "--version") endif() - # check whether the head command exists - find_program(HEAD_EXE head NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_CMAKE_SYSTEM_PATH) - if(HEAD_EXE) - execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${EIGEN_CXX_FLAG_VERSION} - COMMAND head -n 1 - OUTPUT_VARIABLE eigen_cxx_compiler_version_string OUTPUT_STRIP_TRAILING_WHITESPACE) - else() - execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${EIGEN_CXX_FLAG_VERSION} - OUTPUT_VARIABLE eigen_cxx_compiler_version_string OUTPUT_STRIP_TRAILING_WHITESPACE) - string(REGEX REPLACE "[\n\r].*" "" eigen_cxx_compiler_version_string ${eigen_cxx_compiler_version_string}) - endif() + execute_process(COMMAND ${CMAKE_CXX_COMPILER} ${EIGEN_CXX_FLAG_VERSION} + OUTPUT_VARIABLE eigen_cxx_compiler_version_string OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REGEX REPLACE "[\n\r].*" "" eigen_cxx_compiler_version_string ${eigen_cxx_compiler_version_string}) ei_get_compilerver_from_cxx_version_string("${eigen_cxx_compiler_version_string}" CNAME CVER) set(${VAR} "${CNAME}-${CVER}") |