diff --git a/CMakeLists.txt b/CMakeLists.txt index c7286a11501ddd5b90df4f016896f7d35f31fa52..85760ed1ffb462a6e7e5363708278526a26b06a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) INCLUDE(cmake/base.cmake) +INCLUDE(cmake/boost.cmake) SET(PROJECT_NAME dynamic-graph) SET(PROJECT_VERSION 1.0.0.99) @@ -46,13 +47,7 @@ plugindir=${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}") SET(PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} ${LIBINCL_KW}dynamic-graph${LIB_EXT}") # Search for Boost. -SET(Boost_USE_STATIC_LIBS OFF) -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_BOOST() # Search for Pthread. INCLUDE(FindThreads) diff --git a/cmake b/cmake index 0fe8e6ab98f646f0341ec9a0ca29ea90773fb5c8..df5b81fbedf9496ec421ed2f5455a85389c5b987 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 0fe8e6ab98f646f0341ec9a0ca29ea90773fb5c8 +Subproject commit df5b81fbedf9496ec421ed2f5455a85389c5b987