Some fixies
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
cmake_minimum_required(VERSION 3.0)
|
||||
project(i3ipc++)
|
||||
|
||||
OPTION(I3IPCpp_WITH_TESTS "Build unit tests executables" OFF)
|
||||
|
||||
SET(BUILD_STATIC_LIBS ON)
|
||||
SET(BUILD_SHARED_LIBS OFF)
|
||||
add_subdirectory(3rd/jsoncpp)
|
||||
@@ -29,10 +31,11 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
|
||||
file(GLOB_RECURSE SRC src/*.cpp)
|
||||
add_library(i3ipc++_static STATIC ${SRC})
|
||||
|
||||
SET(I3IPCpp_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR})
|
||||
SET(I3IPCpp_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include/)
|
||||
SET(I3IPCpp_LIBRARIES i3ipc++_static ${SIGCPP_LIBRARIES} jsoncpp_lib_static)
|
||||
SET(I3IPCpp_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
|
||||
SET(I3IPCpp_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include/ PARENT_SCOPE)
|
||||
SET(I3IPCpp_LIBRARIES i3ipc++_static ${SIGCPP_LIBRARIES} jsoncpp_lib_static PARENT_SCOPE)
|
||||
|
||||
if(I3IPCpp_WITH_TESTS)
|
||||
find_package(CxxTest)
|
||||
if(CXXTEST_FOUND)
|
||||
include_directories(${CXXTEST_INCLUDE_DIR})
|
||||
@@ -48,3 +51,4 @@ if(CXXTEST_FOUND)
|
||||
else()
|
||||
message(WARNING "CxxTest not found. Unable to run unit-tests")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user