From 33dc63c6bc040bc63c02be814776daa26c749e3c Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Fri, 18 Sep 2015 11:27:55 +0200 Subject: [PATCH] rm module for static linking; fixes #134 --- .travis.yml | 2 +- modules/static_linking.cmake | 42 ------------------------------------ 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 modules/static_linking.cmake diff --git a/.travis.yml b/.travis.yml index 2b4b08c..f891024 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ addons: - g++ - gfortran - cmake - # Math libraries : SYSTEM_NATIVE-static/dynamic and ATLAS-dynamic only + # Math libraries # do not install libatlas-dev due to conflicts of repeating xerbla in *.a lib files - libblas-dev - liblapack-dev diff --git a/modules/static_linking.cmake b/modules/static_linking.cmake deleted file mode 100644 index 2fa6982..0000000 --- a/modules/static_linking.cmake +++ /dev/null @@ -1,42 +0,0 @@ -#.rst: -# -# Enables static linking by appending corresponding compiler flags. -# -# Variables modified (provided the corresponding language is enabled):: -# -# CMAKE_Fortran_FLAGS -# CMAKE_C_FLAGS -# CMAKE_CXX_FLAGS -# -# autocmake.cfg configuration:: -# -# docopt: --static Enable static linking [default: False]. -# define: '-DENABLE_STATIC_LINKING=%s' % arguments['--static'] - -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 "${CMAKE_Fortran_FLAGS} -static") - endif() - if(CMAKE_Fortran_COMPILER_ID MATCHES Intel) - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static -static-libgcc -static-intel") - endif() - if(CMAKE_Fortran_COMPILER_ID MATCHES PGI) - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Bstatic") - endif() - endif() - - if(DEFINED CMAKE_C_COMPILER_ID) - if(CMAKE_C_COMPILER_ID MATCHES GNU) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static -fpic") - endif() - 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()