From 96819268994b557a5d468a035f6d74f0a48b9a00 Mon Sep 17 00:00:00 2001 From: Mathieu Faverge <mathieu.faverge@inria.fr> Date: Mon, 4 Mar 2019 11:05:44 +0100 Subject: [PATCH] Fix Issue #70 --- CMakeLists.txt | 6 ++---- hqr | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0374cfe29..13dcda02f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1015,10 +1015,8 @@ add_subdirectory(runtime) enable_testing() include(CTest) -# Necessary to compile executables (temporary) -# should use SystemDetection.cmake module? -string(REGEX MATCH ".*ifort$" _match_ifort ${CMAKE_Fortran_COMPILER}) -if(_match_ifort) +# Necessary to compile C executables linked with ifort +if(${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel") message(STATUS "Add -nofor_main to the Fortran linker (Intel compiler)") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -nofor_main") endif(_match_ifort) diff --git a/hqr b/hqr index 7ad2afcef..621a15b82 160000 --- a/hqr +++ b/hqr @@ -1 +1 @@ -Subproject commit 7ad2afcef2901aa04c772369b3aa0deb4da9158b +Subproject commit 621a15b8241717f9e8eb5774eadcb6b6d394e99a -- GitLab