diff options
| author | Kentoku SHIBA <kentokushiba@gmail.com> | 2015-05-05 13:48:54 +0900 |
|---|---|---|
| committer | Kentoku SHIBA <kentokushiba@gmail.com> | 2015-05-05 13:48:54 +0900 |
| commit | 872cbb806b3d57d648d4369d161627c554a57856 (patch) | |
| tree | 65b34e2389138be84e85b3f8095b862f8b1d5d53 /storage/mroonga | |
| parent | d33cef1cb0129f4cef8fc25e6ba9991c1675a2a4 (diff) | |
| download | mariadb-git-872cbb806b3d57d648d4369d161627c554a57856.tar.gz | |
revert CMakeList.txt at groonga-normalizer-mysql/normalizers
Diffstat (limited to 'storage/mroonga')
2 files changed, 1 insertions, 20 deletions
diff --git a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt index a8c26f04ad1..3577572a9f1 100644 --- a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/CMakeLists.txt @@ -54,13 +54,6 @@ else() _pkgconfig_invoke(groonga GROONGA PLUGINS_DIR "" --variable=pluginsdir) endif() -if(NOT DEFINED CMAKE_C_COMPILE_OPTIONS_PIC) - # For old CMake - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX) - check_build_flag("-fPIC") - endif() -endif() - include_directories( ${CMAKE_BINARY_DIR} ${GROONGA_INCLUDE_DIRS}) diff --git a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/normalizers/CMakeLists.txt b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/normalizers/CMakeLists.txt index 93f2307b995..db8ffedb082 100644 --- a/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/normalizers/CMakeLists.txt +++ b/storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/normalizers/CMakeLists.txt @@ -17,22 +17,10 @@ set(NORMALIZERS_DIR "${GROONGA_PLUGINS_DIR}/normalizers") read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/mysql_sources.am MYSQL_SOURCES) - -if(NOT DEFINED CMAKE_C_COMPILE_OPTIONS_PIC) - # For old CMake - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX) - check_build_flag("-fPIC") - endif() -endif() - if(GROONGA_NORMALIZER_MYSQL_EMBED) - add_library(mysql_normalizer STATIC ${MYSQL_SOURCES}) + add_convenience_library(mysql_normalizer ${MYSQL_SOURCES}) set_property(TARGET mysql_normalizer APPEND PROPERTY COMPILE_DEFINITIONS "GROONGA_NORMALIZER_MYSQL_EMBED") - set_target_properties( - mysql_normalizer - PROPERTIES - POSITION_INDEPENDENT_CODE ON) else() add_library(mysql_normalizer MODULE ${MYSQL_SOURCES}) set_target_properties(mysql_normalizer PROPERTIES |