OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing minor bugs in CMake for static builds and external libraries

Browse Source
This commit is contained in:
Mark Berrill 2018-04-25 13:27:31 -04:00
parent bfa4d61035
commit 3e00aac2e1
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/libraries.cmake
View File

@ -183,7 +183,7 @@ MACRO( CONFIGURE_NETCDF )
ELSE()
MESSAGE( FATAL_ERROR "Default search for netcdf is not yet supported. Use -D NETCDF_DIRECTORY=" )
ENDIF()
SET( EXTERNAL_LIBS ${EXTERNAL_LIBS} ${NETCDF_LIBS} ${HDF5_LIBS} )
SET( EXTERNAL_LIBS ${NETCDF_LIBS} ${HDF5_LIBS} ${EXTERNAL_LIBS} )
ADD_DEFINITIONS ( -DUSE_NETCDF )
MESSAGE( "Using netcdf" )
MESSAGE( " ${NETCDF_LIBS}" )
@ -211,7 +211,7 @@ MACRO ( CONFIGURE_SILO )
SET ( SILO_LIBS
${SILO_LIB}
)
SET( EXTERNAL_LIBS ${EXTERNAL_LIBS} ${SILO_LIBS} ${HDF5_LIBS} )
SET( EXTERNAL_LIBS ${SILO_LIBS} ${HDF5_LIBS} ${EXTERNAL_LIBS} )
ADD_DEFINITIONS ( -DUSE_SILO )
MESSAGE( "Using silo" )
MESSAGE( " ${SILO_LIB}" )
@ -303,7 +303,12 @@ MACRO ( CONFIGURE_LBPM )
SET( TEST_MAX_PROCS 32 )
ENDIF()
# Add the correct paths to rpath in case we build shared libraries
SET( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )
SET( CMAKE_BUILD_WITH_INSTALL_RPATH TRUE )
SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} "${TIMER_DIRECTORY}" "${LBPM_INSTALL_DIR}/lib" )
IF ( USE_STATIC )
SET( CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE )
SET( CMAKE_BUILD_WITH_INSTALL_RPATH FALSE )
ELSE()
SET( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )
SET( CMAKE_BUILD_WITH_INSTALL_RPATH TRUE )
SET( CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} "${TIMER_DIRECTORY}" "${LBPM_INSTALL_DIR}/lib" )
ENDIF()
ENDMACRO ()

2
cmake/macros.cmake
View File

@ -270,7 +270,7 @@ MACRO( INSTALL_${PROJ}_TARGET PACKAGE )
# Add the library and install the package
IF ( NOT ONLY_BUILD_DOCS AND SOURCES )
# Set RPATH variables
IF ( NOT CMAKE_RPATH_VARIABLES_SET )
IF ( NOT CMAKE_RPATH_VARIABLES_SET AND NOT USE_STATIC )
SET(CMAKE_RPATH_VARIABLES_SET ON)
SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)

2
threadpool/test/CMakeLists.txt
View File

@ -1,5 +1,3 @@
include ( macros )
# Add thread pool tests
ADD_LBPM_TEST( test_atomic )
ADD_LBPM_TEST( test_atomic_list )