From 84d24589befa85bb12685678dba477444e3b6669 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Tue, 4 Aug 2015 13:53:44 -0700 Subject: [PATCH] Link ps against icu instead of scxcore Remove scxcore library from CMake --- src/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 382bf3970..439546e2a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,7 +4,7 @@ project(monad_native) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") #include gtest -include_directories(../ext-src/gtest/fused-src ../ext-src/pal/include impl) +include_directories(../ext-src/gtest/fused-src impl) link_directories(${monad_native_BINARY_DIR}) # source file definitions @@ -17,9 +17,7 @@ SET(HOST_CMDLINE_SOURCE_FILES host/cmdline/main.cpp ${HOST_COMMON_SOURCE_FILES}) # target definitions add_library(ps SHARED ${LIB_SOURCE_FILES}) -add_library(scxcore STATIC IMPORTED GLOBAL) -set_property(TARGET scxcore PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../ext-src/pal/lib/libscxcore.a) -target_link_libraries(ps scxcore) +target_link_libraries(ps icuuc) add_executable(monad_native ${SOURCE_FILES} ${TEST_SOURCE_FILES}) add_executable(host_cmdline ${HOST_CMDLINE_SOURCE_FILES})