Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/CMakeTemplate
This commit is contained in:
commit
a45e758776
@ -61,6 +61,8 @@ else()
|
|||||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_RELEASE_PATH}) #for SHARED
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_RELEASE_PATH}) #for SHARED
|
||||||
|
|
||||||
list(APPEND LIB_PATHS ${LIB_RELEASE_PATH})
|
list(APPEND LIB_PATHS ${LIB_RELEASE_PATH})
|
||||||
|
|
||||||
|
add_definitions(-static-libgcc -static-libstdc++)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#create library and executable
|
#create library and executable
|
||||||
@ -370,6 +372,11 @@ include_directories(
|
|||||||
${EXTRA_INCLUDES}
|
${EXTRA_INCLUDES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(UNIX)
|
||||||
|
# -ldl seems to be required for linux executables
|
||||||
|
LIST(APPEND LIB_DEPENDENCIES_LIST dl)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(LIB_SRC_LIST)
|
if(LIB_SRC_LIST)
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
${LIBRARY_NAME}
|
${LIBRARY_NAME}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user