From d33cab4a4330de7069237716eff370f0af079586 Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Thu, 17 Sep 2015 00:21:06 +0200 Subject: [PATCH] extend static flags to CXX --- modules/static_linking.cmake | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/static_linking.cmake b/modules/static_linking.cmake index e1c6095..2fa6982 100644 --- a/modules/static_linking.cmake +++ b/modules/static_linking.cmake @@ -18,13 +18,13 @@ option(ENABLE_STATIC_LINKING "Enable static libraries linking" OFF) if(ENABLE_STATIC_LINKING) if(DEFINED CMAKE_Fortran_COMPILER_ID) if(CMAKE_Fortran_COMPILER_ID MATCHES GNU) - set(CMAKE_Fortran_FLAGS "-static ${CMAKE_Fortran_FLAGS}") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static") endif() if(CMAKE_Fortran_COMPILER_ID MATCHES Intel) - set(CMAKE_Fortran_FLAGS "-static -static-libgcc -static-intel ${CMAKE_Fortran_FLAGS}") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static -static-libgcc -static-intel") endif() if(CMAKE_Fortran_COMPILER_ID MATCHES PGI) - set(CMAKE_Fortran_FLAGS "-Bstatic ${CMAKE_Fortran_FLAGS}") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Bstatic") endif() endif() @@ -32,8 +32,11 @@ if(ENABLE_STATIC_LINKING) if(CMAKE_C_COMPILER_ID MATCHES GNU) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static -fpic") endif() - if(CMAKE_C_COMPILER_ID MATCHES Clang) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Bstatic -fpic") + endif() + + if(DEFINED CMAKE_CXX_COMPILER_ID) + if(CMAKE_C_COMPILER_ID MATCHES GNU) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static -fpic") endif() endif() endif()