fabs/i3ipcpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some fixies

Browse Source
This commit is contained in:
Sergey Naumov
2015-12-29 12:59:19 +03:00
parent fe8824692e
commit f8c71782be
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
CMakeLists.txt
View File

@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
project(i3ipc++) project(i3ipc++)
OPTION(I3IPCpp_WITH_TESTS "Build unit tests executables" OFF)
SET(BUILD_STATIC_LIBS ON) SET(BUILD_STATIC_LIBS ON)
SET(BUILD_SHARED_LIBS OFF) SET(BUILD_SHARED_LIBS OFF)
add_subdirectory(3rd/jsoncpp) add_subdirectory(3rd/jsoncpp)
@@ -29,22 +31,24 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2")
file(GLOB_RECURSE SRC src/*.cpp) file(GLOB_RECURSE SRC src/*.cpp)
add_library(i3ipc++_static STATIC ${SRC}) add_library(i3ipc++_static STATIC ${SRC})
SET(I3IPCpp_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR}) SET(I3IPCpp_LIBRARY_DIRS ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
SET(I3IPCpp_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include/) SET(I3IPCpp_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include/ PARENT_SCOPE)
SET(I3IPCpp_LIBRARIES i3ipc++_static ${SIGCPP_LIBRARIES} jsoncpp_lib_static) SET(I3IPCpp_LIBRARIES i3ipc++_static ${SIGCPP_LIBRARIES} jsoncpp_lib_static PARENT_SCOPE)
find_package(CxxTest) if(I3IPCpp_WITH_TESTS)
if(CXXTEST_FOUND) find_package(CxxTest)
include_directories(${CXXTEST_INCLUDE_DIR}) if(CXXTEST_FOUND)
include_directories(src/) include_directories(${CXXTEST_INCLUDE_DIR})
add_definitions( include_directories(src/)
-DTEST_SRC_ROOT="${CMAKE_CURRENT_SOURCE_DIR}/test" add_definitions(
) -DTEST_SRC_ROOT="${CMAKE_CURRENT_SOURCE_DIR}/test"
)
enable_testing() enable_testing()
file(GLOB SRC_TEST test/*.hpp) file(GLOB SRC_TEST test/*.hpp)
CXXTEST_ADD_TEST(i3ipcpp_check test.cpp ${SRC_TEST}) CXXTEST_ADD_TEST(i3ipcpp_check test.cpp ${SRC_TEST})
target_link_libraries(i3ipcpp_check ${I3IPCpp_LIBRARIES}) target_link_libraries(i3ipcpp_check ${I3IPCpp_LIBRARIES})
else() else()
message(WARNING "CxxTest not found. Unable to run unit-tests") message(WARNING "CxxTest not found. Unable to run unit-tests")
endif()
endif() endif()