tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build all remaining libraries as object libraries

This commit is contained in:
Gunnar Beutner 2018-01-17 14:59:02 +01:00
parent ead9baa0ef
commit e1134fd3d9
9 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -123,12 +123,17 @@ include_directories(${Boost_INCLUDE_DIRS})
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR})
set(base_DEPS ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
set(base_OBJS $<TARGET_OBJECTS:mmatch> $<TARGET_OBJECTS:socketpair> $<TARGET_OBJECTS:base>)
find_package(YAJL) find_package(YAJL)
if(NOT YAJL_FOUND) if(NOT YAJL_FOUND)
include_directories(${icinga2_BINARY_DIR}/third-party/yajl/include) include_directories(${icinga2_BINARY_DIR}/third-party/yajl/include)
link_directories(${icinga2_BINARY_DIR}/third-party/yajl) link_directories(${icinga2_BINARY_DIR}/third-party/yajl)
set(YAJL_LIBRARIES "yajl") list(APPEND base_SOURCES $<TARGET_OBJECTS:yajl>)
else()
list(APPEND base_DEPS ${YAJL_LIBRARIES})
endif() endif()
find_package(Editline) find_package(Editline)
@ -142,14 +147,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/lib
) )
set(base_DEPS ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${YAJL_LIBRARIES} mmatch socketpair)
if(HAVE_LIBEXECINFO) if(HAVE_LIBEXECINFO)
list(APPEND base_DEPS execinfo) list(APPEND base_DEPS execinfo)
endif() endif()
if(UNIX OR CYGWIN) if(UNIX OR CYGWIN)
list(APPEND base_DEPS execvpe) list(APPEND base_OBJS $<TARGET_OBJECTS:execvpe>)
endif() endif()
if(EDITLINE_FOUND) if(EDITLINE_FOUND)

2
icinga-app/CMakeLists.txt
View File

@ -65,6 +65,8 @@ endif()
add_executable(icinga-app add_executable(icinga-app
$<TARGET_OBJECTS:icingaloader> $<TARGET_OBJECTS:icingaloader>
$<TARGET_OBJECTS:mmatch>
$<TARGET_OBJECTS:socketpair>
$<TARGET_OBJECTS:base> $<TARGET_OBJECTS:base>
$<TARGET_OBJECTS:config> $<TARGET_OBJECTS:config>
$<TARGET_OBJECTS:remote> $<TARGET_OBJECTS:remote>

2
icinga-studio/CMakeLists.txt
View File

@ -32,7 +32,7 @@ set(icinga_studio_SOURCES
connectform.cpp connectform.hpp connectform.cpp connectform.hpp
mainform.cpp mainform.hpp mainform.cpp mainform.hpp
icinga.icns ${WindowsSources} icinga.icns ${WindowsSources}
$<TARGET_OBJECTS:base> ${base_OBJS}
$<TARGET_OBJECTS:config> $<TARGET_OBJECTS:config>
$<TARGET_OBJECTS:remote> $<TARGET_OBJECTS:remote>
) )

2
plugins/CMakeLists.txt
View File

@ -17,7 +17,7 @@
add_executable(check_nscp_api add_executable(check_nscp_api
check_nscp_api.cpp check_nscp_api.cpp
$<TARGET_OBJECTS:base> ${base_OBJS}
$<TARGET_OBJECTS:config> $<TARGET_OBJECTS:config>
$<TARGET_OBJECTS:remote> $<TARGET_OBJECTS:remote>
) )

6
test/CMakeLists.txt
View File

@ -44,7 +44,7 @@ set(base_test_SOURCES
icinga-notification.cpp icinga-notification.cpp
icinga-perfdata.cpp icinga-perfdata.cpp
remote-url.cpp remote-url.cpp
$<TARGET_OBJECTS:base> ${base_OBJS}
$<TARGET_OBJECTS:config> $<TARGET_OBJECTS:config>
$<TARGET_OBJECTS:remote> $<TARGET_OBJECTS:remote>
$<TARGET_OBJECTS:icinga> $<TARGET_OBJECTS:icinga>
@ -146,7 +146,7 @@ if(ICINGA2_WITH_LIVESTATUS)
set(livestatus_test_SOURCES set(livestatus_test_SOURCES
livestatus-fixture.cpp livestatus-fixture.cpp
livestatus.cpp livestatus.cpp
$<TARGET_OBJECTS:base> ${base_OBJS}
$<TARGET_OBJECTS:config> $<TARGET_OBJECTS:config>
$<TARGET_OBJECTS:remote> $<TARGET_OBJECTS:remote>
$<TARGET_OBJECTS:icinga> $<TARGET_OBJECTS:icinga>
@ -168,7 +168,7 @@ endif()
set(icinga_checkable_test_SOURCES set(icinga_checkable_test_SOURCES
icinga-checkable-fixture.cpp icinga-checkable-fixture.cpp
icinga-checkable-flapping.cpp icinga-checkable-flapping.cpp
$<TARGET_OBJECTS:base> ${base_OBJS}
$<TARGET_OBJECTS:config> $<TARGET_OBJECTS:config>
$<TARGET_OBJECTS:remote> $<TARGET_OBJECTS:remote>
$<TARGET_OBJECTS:icinga> $<TARGET_OBJECTS:icinga>

2
third-party/execvpe/CMakeLists.txt vendored
View File

@ -19,7 +19,7 @@ set(execvpe_SOURCES
execvpe.c execvpe.h execvpe.c execvpe.h
) )
add_library(execvpe STATIC ${execvpe_SOURCES}) add_library(execvpe OBJECT ${execvpe_SOURCES})
set_target_properties ( set_target_properties (
execvpe PROPERTIES execvpe PROPERTIES

2
third-party/mmatch/CMakeLists.txt vendored
View File

@ -19,7 +19,7 @@ set(mmatch_SOURCES
mmatch.c mmatch.h mmatch.c mmatch.h
) )
add_library(mmatch STATIC ${mmatch_SOURCES}) add_library(mmatch OBJECT ${mmatch_SOURCES})
set_target_properties( set_target_properties(
mmatch PROPERTIES mmatch PROPERTIES

2
third-party/socketpair/CMakeLists.txt vendored
View File

@ -19,7 +19,7 @@ set(socketpair_SOURCES
socketpair.c socketpair.h socketpair.c socketpair.h
) )
add_library(socketpair STATIC ${socketpair_SOURCES}) add_library(socketpair OBJECT ${socketpair_SOURCES})
set_target_properties ( set_target_properties (
socketpair PROPERTIES socketpair PROPERTIES

2
third-party/yajl/src/CMakeLists.txt vendored
View File

@ -30,7 +30,7 @@ ADD_DEFINITIONS(-DYAJL_BUILD)
# set up some paths # set up some paths
SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../include/yajl) SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../include/yajl)
ADD_LIBRARY(yajl STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) ADD_LIBRARY(yajl OBJECT ${SRCS} ${HDRS} ${PUB_HDRS})
#### setup shared library version number #### setup shared library version number
SET_TARGET_PROPERTIES(yajl SET_TARGET_PROPERTIES(yajl