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

Merge pull request #5999 from Icinga/fix/build-fix 

Build fix
This commit is contained in:
Gunnar Beutner 2018-01-17 15:31:57 +01:00 committed by GitHub
parent b9d267318f 892afea435
commit a80b883991
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -131,7 +131,7 @@ find_package(YAJL)
if(NOT YAJL_FOUND)
include_directories(${icinga2_BINARY_DIR}/third-party/yajl/include)
link_directories(${icinga2_BINARY_DIR}/third-party/yajl)
list(APPEND base_SOURCES $<TARGET_OBJECTS:yajl>)
list(APPEND base_OBJS $<TARGET_OBJECTS:yajl>)
else()
list(APPEND base_DEPS ${YAJL_LIBRARIES})
endif()

4
icinga-app/CMakeLists.txt
View File

@ -65,9 +65,7 @@ endif()
add_executable(icinga-app
$<TARGET_OBJECTS:icingaloader>
$<TARGET_OBJECTS:mmatch>
$<TARGET_OBJECTS:socketpair>
$<TARGET_OBJECTS:base>
${base_OBJS}
$<TARGET_OBJECTS:config>
$<TARGET_OBJECTS:remote>
$<TARGET_OBJECTS:cli>