Kouhei Sutou
null+****@clear*****
Thu Mar 12 15:23:58 JST 2015
Kouhei Sutou 2015-03-12 15:23:58 +0900 (Thu, 12 Mar 2015) New Revision: 3d16612575f07e47a45bc58d4c81ab171eb5c62d https://github.com/groonga/groonga/commit/3d16612575f07e47a45bc58d4c81ab171eb5c62d Message: cmake windows: fix configuration for linking Onigmo statically Modified files: CMakeLists.txt vendor/onigmo/CMakeLists.txt Modified: CMakeLists.txt (+4 -0) =================================================================== --- CMakeLists.txt 2015-03-12 15:12:11 +0900 (d910f51) +++ CMakeLists.txt 2015-03-12 15:23:58 +0900 (1710da4) @@ -546,6 +546,10 @@ set(GRN_WITH_ONIGMO ON) set(ONIGMO_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/vendor/onigmo-source") set(ONIGMO_LIBS onigmo) +# TODO: It's for Onigmo static link case. If we support system Onigmo, +# we need to remove it and add -DEXPORT to Onigmo build. +add_definitions(-DONIG_EXTERN=extern) + add_subdirectory(vendor) add_subdirectory(lib) if(NOT GRN_EMBED) Modified: vendor/onigmo/CMakeLists.txt (+0 -1) =================================================================== --- vendor/onigmo/CMakeLists.txt 2015-03-12 15:12:11 +0900 (8f90d3e) +++ vendor/onigmo/CMakeLists.txt 2015-03-12 15:23:58 +0900 (f088d8a) @@ -34,7 +34,6 @@ if(GRN_WITH_ONIGMO) ac_check_sizeof(int) ac_check_sizeof(long) - add_definitions(-DEXPORT) if(MSVC) add_definitions(-Dinline=__inline) endif() -------------- next part -------------- HTML����������������������������...Download