Skip to content
Snippets Groups Projects
Commit a234ca84 authored by Thomas Moulard's avatar Thomas Moulard
Browse files

Switch to new Boost detection macro.

parent 318fa961
No related branches found
No related tags found
No related merge requests found
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6) CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
INCLUDE(cmake/base.cmake) INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake)
SET(PROJECT_NAME dynamic-graph) SET(PROJECT_NAME dynamic-graph)
SET(PROJECT_VERSION 1.0.0.99) SET(PROJECT_VERSION 1.0.0.99)
...@@ -46,13 +47,7 @@ plugindir=${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}") ...@@ -46,13 +47,7 @@ plugindir=${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}")
SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} ${LIBINCL_KW}dynamic-graph${LIB_EXT}") SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} ${LIBINCL_KW}dynamic-graph${LIB_EXT}")
# Search for Boost. # Search for Boost.
SET(Boost_USE_STATIC_LIBS OFF) SEARCH_FOR_BOOST()
SET(Boost_USE_MULTITHREAD ON)
FIND_PACKAGE(Boost 1.33 COMPONENTS thread REQUIRED)
SET(PKG_CONFIG_CFLAGS "${PKG_CONFIG_CFLAGS} -I${Boost_INCLUDE_DIR}")
SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} ${LIBDIR_KW}${Boost_LIBRARY_DIRS}")
ADD_DEFINITIONS(-DHAVE_LIBBOOST_THREAD)
# Search for Pthread. # Search for Pthread.
INCLUDE(FindThreads) INCLUDE(FindThreads)
......
Subproject commit 0fe8e6ab98f646f0341ec9a0ca29ea90773fb5c8 Subproject commit df5b81fbedf9496ec421ed2f5455a85389c5b987
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment