From 67c5b31225fb3b0289e8fc777ad3e511f2f6a1ab Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Wed, 16 Jan 2013 17:01:02 -0200 Subject: [PATCH] Fix ICU linkage on ubuntu --- src/framework/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt index b11592af..30febf3d 100644 --- a/src/framework/CMakeLists.txt +++ b/src/framework/CMakeLists.txt @@ -174,9 +174,6 @@ if(WIN32) set(Boost_THREADAPI win32) set(framework_DEFINITIONS ${framework_DEFINITIONS} -DBOOST_THREAD_USE_LIB) # fix boost thread linkage set(REQUIRED_BOOST_COMPONENTS ${REQUIRED_BOOST_COMPONENTS} chrono) # mingw32 does not have std::thread -else() - find_package(ICU) - set(Boost_LIBRARIES ${Boost_LIBRARIES} ${ICU_LIBRARIES}) endif() set(Boost_USE_MULTITHREADED ON) set(Boost_USE_STATIC_LIBS ${USE_STATIC_LIBS}) @@ -243,7 +240,8 @@ else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -rdynamic -Wl,-rpath,./libs") # rdynamic is needed by backtrace.h used in crash handler set(SYSTEM_LIBRARIES dl) - set(framework_LIBRARIES ${framework_LIBRARIES} ${SYSTEM_LIBRARIES}) + find_package(ICU) + set(framework_LIBRARIES ${framework_LIBRARIES} ${ICU_LIBRARIES} ${SYSTEM_LIBRARIES}) endif() if(FRAMEWORK_GRAPHICS)