From bceb35374398e493fe708f47291154b311e1daec Mon Sep 17 00:00:00 2001 From: Charles Lesire-Cabaniols Date: Wed, 11 Apr 2012 12:31:36 +0200 Subject: [PATCH] Fix link to boost_regex library --- CMakeLists.txt | 2 +- bindings/ruby/CMakeLists.txt | 2 +- typelib/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84d7c19..54a5bdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/typelib) INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}) INCLUDE_DIRECTORIES(BEFORE ${CMAKE_BINARY_DIR}) -FIND_PACKAGE(Boost COMPONENTS unit_test_framework system filesystem) +FIND_PACKAGE(Boost COMPONENTS unit_test_framework system filesystem regex) IF(NOT Boost_FOUND) MESSAGE(FATAL_ERROR "please install boost or check BOOST_ROOT setting -- before building typelib") ELSE(NOT Boost_FOUND) diff --git a/bindings/ruby/CMakeLists.txt b/bindings/ruby/CMakeLists.txt index eae9714..08b0cff 100644 --- a/bindings/ruby/CMakeLists.txt +++ b/bindings/ruby/CMakeLists.txt @@ -50,7 +50,7 @@ IF(ENABLE_DYNCALL) ADD_DEPENDENCIES(typelib_ruby dyncall) ENDIF(ENABLE_DYNCALL) -TARGET_LINK_LIBRARIES(typelib_ruby typeLib typeLang_cSupport ${Utilmm_LIBRARIES}) +TARGET_LINK_LIBRARIES(typelib_ruby typeLib typeLang_cSupport ${Utilmm_LIBRARIES} ${Boost_REGEX_LIBRARIES}) CONFIGURE_FILE(typelib_ruby.pc.in ${CMAKE_CURRENT_BINARY_DIR}/typelib_ruby.pc @ONLY) diff --git a/typelib/CMakeLists.txt b/typelib/CMakeLists.txt index e8624c1..d249915 100644 --- a/typelib/CMakeLists.txt +++ b/typelib/CMakeLists.txt @@ -14,7 +14,7 @@ endif (NOT TYPELIB_PLUGIN_PATH) set_source_files_properties(endianness.cc PROPERTIES COMPILE_FLAGS -fno-strict-aliasing) -target_link_libraries(typeLib ${Utilmm_LIBRARIES} ${CMAKE_DL_LIBS} ${Boost_FILESYSTEM_LIBRARIES} ${Boost_SYSTEM_LIBRARIES}) +target_link_libraries(typeLib ${Utilmm_LIBRARIES} ${CMAKE_DL_LIBS} ${Boost_FILESYSTEM_LIBRARIES} ${Boost_SYSTEM_LIBRARIES} ${Boost_REGEX_LIBRARIES}) #TARGET_LINK_LIBRARIES(typeLib typeLang_c typeLang_tlb typeLang_idl) install(TARGETS typeLib -- 1.7.5.4