]> granicus.if.org Git - icinga2/commitdiff
Build fix 5999/head
authorGunnar Beutner <gunnar.beutner@icinga.com>
Wed, 17 Jan 2018 14:08:44 +0000 (15:08 +0100)
committerGunnar Beutner <gunnar.beutner@icinga.com>
Wed, 17 Jan 2018 14:26:49 +0000 (15:26 +0100)
CMakeLists.txt
icinga-app/CMakeLists.txt

index 8d5006d296e098c8bf259df2cf0a34a1b618178a..dda5f19859f84f9c9c0802b313923dfb5c898119 100644 (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()
index cc209ed753306df563e2103b56534c25707cc59b..69286bdeb135de4935e42f401d045d0bf2802c2e 100644 (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>