Merge pull request #1 from palanceli/dev

修改CMakeList文件
palanceli · Aug 15, 2019 · 1317f63 · 1317f63
2 parents 1eb15a4 + 5db061c
commit 1317f63
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,4 @@
 *.exe
 *.out
 *.app
+build/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,14 +1,17 @@
 project(googlepinyin)
 cmake_minimum_required(VERSION 2.6)
 
-option(ENABLE_STATIC "Build static library" False)
+option(ENABLE_STATIC "Build static library" True)
 
 # uninstall target
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
     IMMEDIATE @ONLY)
 
+# 加上下面这行以屏蔽Warning: MACOSX_RPATH is not specified
+SET(CMAKE_MACOSX_RPATH 1)
+
 SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
 
 add_custom_target(uninstall
@@ -26,7 +29,10 @@ set(datadir ${CMAKE_INSTALL_PREFIX}/share)
 set(localedir ${CMAKE_INSTALL_PREFIX}/share/locale)
 set(includedir  ${CMAKE_INSTALL_PREFIX}/include/googlepinyin)
 set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAG}")
+
+#set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAG}")  # 在mac OS下会报错，用下面这行替换
+set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-undefined,error ${CMAKE_SHARED_LINKER_FLAG}")
+
 
 add_subdirectory(src)
 add_subdirectory(tools)
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,3 +30,4 @@ @@
     *.exe
     *.out
     *.app
+    build/