Did the merge work?

2016-06-11 14:33:54 +02:00
parent 439740abc3 c2e29dcbc6
commit 029d22a8cd
8 changed files with 382 additions and 135 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ include_directories(
 )

 link_directories(
-	${SIBCPP_LIBRARY_DIRS}
+	${SIGCPP_LIBRARY_DIRS}
 	3rd/jsoncpp/src/lib_json/
 )

@@ -42,6 +42,7 @@ add_library(i3ipc++_static STATIC ${SRC})

 set(I3IPCpp_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 set(I3IPCpp_INCLUDE_DIRS
+	${SIGCPP_INCLUDE_DIRS}
 	3rd/auss/include
 	${CMAKE_CURRENT_SOURCE_DIR}/include/
 )