OpenCMT/uLib
1
0
Fork 0
mirror of https://github.com/OpenCMT/uLib.git synced 2025-12-06 07:21:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

No static link in lib

Browse Source
This commit is contained in:
Paolo Andreetto
2019-03-26 15:36:34 +01:00
parent 9fa51cdc3b
commit f8cb48d051
8 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMake/uLibGenerateDoc.cmake
View File

@@ -45,7 +45,9 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg
"WARN_IF_DOC_ERROR=YES\n" "WARN_IF_DOC_ERROR=YES\n"
"WARN_FORMAT=\"$file:$line: $text\"\n" "WARN_FORMAT=\"$file:$line: $text\"\n"
"INPUT=${CMAKE_CURRENT_SOURCE_DIR}/src\n" "INPUT=${CMAKE_CURRENT_SOURCE_DIR}/src\n"
"FILE_PATTERNS=*.cpp *.c *.h *.hpp\n" "FILE_PATTERNS=*.h *.hpp\n"
"ENABLE_PREPROCESSING=YES\n"
"MACRO_EXPANSION=YES\n"
"RECURSIVE=YES\n" "RECURSIVE=YES\n"
"EXCLUDE_SYMLINKS=NO\n" "EXCLUDE_SYMLINKS=NO\n"
"FILTER_SOURCE_FILES=NO\n" "FILTER_SOURCE_FILES=NO\n"

8
CMake/uLibTargetMacros.cmake
View File

@@ -30,13 +30,15 @@ macro(uLib_add_shared_library name)
set_target_properties(${mname} PROPERTIES set_target_properties(${mname} PROPERTIES
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_SOVERSION} SOVERSION ${PROJECT_SOVERSION}
INTERFACE_LINK_LIBRARIES "${LIBRARIES}" # INTERFACE_LINK_LIBRARIES "${LIBRARIES}"
LINK_INTERFACE_LIBRARIES "${LIBRARIES}" ## <- ok for cmake from 2.12 ? # LINK_INTERFACE_LIBRARIES "${LIBRARIES}" ## <- ok for cmake from 2.12 ?
IMPORTED_LINK_INTERFACE_LIBRARIES "${LIBRARIES}" ## <- breaks cmake after 2.11 ? # IMPORTED_LINK_INTERFACE_LIBRARIES "${LIBRARIES}" ## <- breaks cmake after 2.11 ?
# PUBLIC_HEADER "" # PUBLIC_HEADER ""
) )
debug(LIBRARIES) debug(LIBRARIES)
target_link_libraries(${mname} ${LIBRARIES})
install(TARGETS ${mname} install(TARGETS ${mname}
EXPORT "${PROJECT_NAME}Targets" EXPORT "${PROJECT_NAME}Targets"
RUNTIME DESTINATION ${PACKAGE_INSTALL_BIN_DIR} COMPONENT bin RUNTIME DESTINATION ${PACKAGE_INSTALL_BIN_DIR} COMPONENT bin

2
CMakeLists.txt
View File

@@ -38,7 +38,7 @@ include(uLibDebugMacro)
include(uLibTargetMacros) include(uLibTargetMacros)
include(uLibGenerateRMake) include(uLibGenerateRMake)
include(uLibGenerateRPMS) include(uLibGenerateRPMS)
include(uLibGenerateDoc) #include(uLibGenerateDoc)
## GLOBALS ------------------------------------------------------------------ ## ## GLOBALS ------------------------------------------------------------------ ##

2
Jenkinsfile vendored
View File

@@ -2,7 +2,7 @@ pipeline {
agent { agent {
docker { docker {
image 'infnpd/cmt-environment:latest-centos7' image 'infnpd/cmt-environment:1.0-centos7'
args '-u 0:0' args '-u 0:0'
label 'DOCKER' label 'DOCKER'
} }

2
src/Core/CMakeLists.txt
View File

@@ -38,8 +38,6 @@ set(LIBRARIES
${Boost_SIGNALS_LIBRARY} ${Boost_SIGNALS_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${ROOT_LIBRARIES} ${ROOT_LIBRARIES}
${PACKAGE_LIBPREFIX}Core
${PACKAGE_LIBPREFIX}Math
) )
uLib_add_shared_library(${uLib-module}) uLib_add_shared_library(${uLib-module})

1
src/Detectors/CMakeLists.txt
View File

@@ -31,7 +31,6 @@ set(LIBRARIES
${ROOT_LIBRARIES} ${ROOT_LIBRARIES}
${PACKAGE_LIBPREFIX}Core ${PACKAGE_LIBPREFIX}Core
${PACKAGE_LIBPREFIX}Math ${PACKAGE_LIBPREFIX}Math
${PACKAGE_LIBPREFIX}Detectors
) )
uLib_add_shared_library(${uLib-module}) uLib_add_shared_library(${uLib-module})

1
src/Math/CMakeLists.txt
View File

@@ -42,7 +42,6 @@ set(LIBRARIES
${Eigen_LIBRARY} ${Eigen_LIBRARY}
${ROOT_LIBRARIES} ${ROOT_LIBRARIES}
${PACKAGE_LIBPREFIX}Core ${PACKAGE_LIBPREFIX}Core
${PACKAGE_LIBPREFIX}Math
) )

1
src/Vtk/CMakeLists.txt
View File

@@ -31,7 +31,6 @@ set(LIBRARIES
${PACKAGE_LIBPREFIX}Core ${PACKAGE_LIBPREFIX}Core
${PACKAGE_LIBPREFIX}Math ${PACKAGE_LIBPREFIX}Math
${PACKAGE_LIBPREFIX}Detectors ${PACKAGE_LIBPREFIX}Detectors
${PACKAGE_LIBPREFIX}Vtk
) )
uLib_add_shared_library(${uLib-module}) uLib_add_shared_library(${uLib-module})