AnotherFoxGuy/autocmake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove static linking from tests

Browse Source 
this will be implemented and tested externally
see #134
This commit is contained in:
Radovan Bast 2015-09-17 10:06:52 +02:00
parent b7e8a5442b
commit bed8a42945
8 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/cc_lapacke/cmake/autocmake.cfg
View File

@ -5,9 +5,6 @@ min_cmake_version: 2.8
[cc] [cc]
source: ../../../modules/cc.cmake source: ../../../modules/cc.cmake
[static]
source: ../../../modules/static_linking.cmake
[math_libs] [math_libs]
source: ../../../modules/math_libs.cmake source: ../../../modules/math_libs.cmake

3
test/cxx/cmake/autocmake.cfg
View File

@ -5,9 +5,6 @@ min_cmake_version: 2.8
[cxx] [cxx]
source: ../../../modules/cxx.cmake source: ../../../modules/cxx.cmake
[static]
source: ../../../modules/static_linking.cmake
[default_build_paths] [default_build_paths]
source: ../../../modules/default_build_paths.cmake source: ../../../modules/default_build_paths.cmake

3
test/fc/cmake/autocmake.cfg
View File

@ -5,9 +5,6 @@ min_cmake_version: 2.8
[fc] [fc]
source: ../../../modules/fc.cmake source: ../../../modules/fc.cmake
[static]
source: ../../../modules/static_linking.cmake
[default_build_paths] [default_build_paths]
source: ../../../modules/default_build_paths.cmake source: ../../../modules/default_build_paths.cmake

3
test/fc_blas/cmake/autocmake.cfg
View File

@ -5,9 +5,6 @@ min_cmake_version: 2.8
[fc] [fc]
source: ../../../modules/fc.cmake source: ../../../modules/fc.cmake
[static]
source: ../../../modules/static_linking.cmake
[int64] [int64]
source: ../../../modules/int64.cmake source: ../../../modules/int64.cmake

6
test/fc_blas/src/CMakeLists.txt
View File

@ -3,12 +3,6 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES PGI)
list(REMOVE_ITEM CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-rdynamic") list(REMOVE_ITEM CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-rdynamic")
endif() endif()
if(CMAKE_Fortran_COMPILER_ID MATCHES Intel AND ENABLE_STATIC_LINKING)
# prevent "ifort: ... warning #10121: overriding '-static-intel' with
# '-i_dynamic'"
list(REMOVE_ITEM CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-i_dynamic")
endif()
if(BLAS_FOUND) if(BLAS_FOUND)
add_executable(example example.f90) add_executable(example example.f90)
target_link_libraries(example ${MATH_LIBS}) target_link_libraries(example ${MATH_LIBS})

3
test/fc_lapack/cmake/autocmake.cfg
View File

@ -5,9 +5,6 @@ min_cmake_version: 2.8
[fc] [fc]
source: ../../../modules/fc.cmake source: ../../../modules/fc.cmake
[static]
source: ../../../modules/static_linking.cmake
[int64] [int64]
source: ../../../modules/int64.cmake source: ../../../modules/int64.cmake

5
test/fc_lapack/src/CMakeLists.txt
View File

@ -3,11 +3,6 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES PGI)
list(REMOVE_ITEM CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-rdynamic") list(REMOVE_ITEM CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-rdynamic")
endif() endif()
if(CMAKE_Fortran_COMPILER_ID MATCHES Intel AND ENABLE_STATIC_LINKING)
# prevent "ifort: ... warning #10121: overriding '-static-intel' with '-i_dynamic'"
list(REMOVE_ITEM CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS "-i_dynamic")
endif()
if(LAPACK_FOUND) if(LAPACK_FOUND)
add_executable(example example.F90) add_executable(example example.F90)
target_link_libraries(example ${MATH_LIBS}) target_link_libraries(example ${MATH_LIBS})

25
test/test.py
View File

@ -105,11 +105,6 @@ def test_extra_cmake_options():
def test_cxx(): def test_cxx():
configure_build_and_exe('cxx', 'python setup.py --cxx=g++') configure_build_and_exe('cxx', 'python setup.py --cxx=g++')
@skip_on_osx
def test_cxx_static():
configure_build_and_exe('cxx', 'python setup.py --cxx=g++ --static')
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -152,11 +147,6 @@ def test_fc_omp():
os.environ['OMP_NUM_THREADS'] = '2' os.environ['OMP_NUM_THREADS'] = '2'
configure_build_and_exe('fc_omp', 'python setup.py --omp --fc=gfortran') configure_build_and_exe('fc_omp', 'python setup.py --omp --fc=gfortran')
@skip_on_osx
def test_fc_static():
configure_build_and_exe('fc', 'python setup.py --fc=gfortran --static')
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -164,11 +154,6 @@ def test_fc_blas():
configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"') configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"')
@skip_on_osx
def test_fc_blas_static():
configure_build_and_exe('fc_blas', 'python setup.py --fc=gfortran --static --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"')
def test_cxx_cblas(): def test_cxx_cblas():
configure_build_and_exe('cxx_cblas', 'python setup.py --cxx=g++ --cblas') configure_build_and_exe('cxx_cblas', 'python setup.py --cxx=g++ --cblas')
@ -179,20 +164,10 @@ def test_fc_lapack():
configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"') configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"')
@skip_on_osx
def test_fc_lapack_static():
configure_build_and_exe('fc_lapack', 'python setup.py --fc=gfortran --static --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"')
@skip_on_osx @skip_on_osx
def test_cc_lapacke(): def test_cc_lapacke():
configure_build_and_exe('cc_lapacke', 'python setup.py --cc=gcc --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"') configure_build_and_exe('cc_lapacke', 'python setup.py --cc=gcc --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"')
@skip_on_osx
def test_cc_lapacke_static():
configure_build_and_exe('cc_lapacke', 'python setup.py --cc=gcc --static --cmake-options="-DMATH_LIB_SEARCH_ORDER=\'OPENBLAS;ATLAS;MKL;SYSTEM_NATIVE\'"')
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------