Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 468970 | Differences between
and this patch

Collapse All | Expand All

(-)a/CMakeLists.txt (+5 lines)
Lines 10-15 set(LIBRIME_SOVERSION 0) Link Here
10
option(BUILD_SHARED_LIBS "Build Rime as shared library" ON)
10
option(BUILD_SHARED_LIBS "Build Rime as shared library" ON)
11
option(BUILD_STATIC "Build Rime using static libraries" OFF)
11
option(BUILD_STATIC "Build Rime using static libraries" OFF)
12
option(BUILD_DATA "Build data for Rime" OFF)
12
option(BUILD_DATA "Build data for Rime" OFF)
13
option(BUILD_TEST "Build gtest framwork for Rime" OFF)
13
14
14
SET(RIME_DATA_DIR "/share/rime-data" CACHE STRING "Target directory for Rime data")
15
SET(RIME_DATA_DIR "/share/rime-data" CACHE STRING "Target directory for Rime data")
15
16
Lines 47-56 if(Glog_FOUND) Link Here
47
endif(Glog_FOUND)
48
endif(Glog_FOUND)
48
49
49
find_package(Threads)
50
find_package(Threads)
51
52
if(BUILD_TEST)
50
find_package(GTest)
53
find_package(GTest)
51
if(GTEST_FOUND)
54
if(GTEST_FOUND)
55
  enable_testing()
52
  include_directories(${GTEST_INCLUDE_DIRS})
56
  include_directories(${GTEST_INCLUDE_DIRS})
53
endif(GTEST_FOUND)
57
endif(GTEST_FOUND)
58
endif(BUILD_TEST)
54
59
55
find_package(YamlCpp REQUIRED)
60
find_package(YamlCpp REQUIRED)
56
if(YamlCpp_FOUND)
61
if(YamlCpp_FOUND)
(-)a/test/CMakeLists.txt (-4 / +1 lines)
Lines 19-26 file(COPY ${PROJECT_SOURCE_DIR}/data/test/dictionary_test.dict.yaml Link Here
19
19
20
if(NOT MSVC AND NOT XCODE_VERSION)
20
if(NOT MSVC AND NOT XCODE_VERSION)
21
set(RIME_TEST_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/rime_test${EXT})
21
set(RIME_TEST_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/rime_test${EXT})
22
add_custom_command(TARGET rime_test
22
add_test(rime_test ${RIME_TEST_EXECUTABLE})
23
                   POST_BUILD
24
                   COMMAND ${RIME_TEST_EXECUTABLE}
25
                   WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
26
endif(NOT MSVC AND NOT XCODE_VERSION)
23
endif(NOT MSVC AND NOT XCODE_VERSION)

Return to bug 468970