From 872cbb806b3d57d648d4369d161627c554a57856 Mon Sep 17 00:00:00 2001 From: Kentoku SHIBA Date: Tue, 5 May 2015 13:48:54 +0900 Subject: [PATCH] revert CMakeList.txt at groonga-normalizer-mysql/normalizers --- .../groonga-normalizer-mysql/CMakeLists.txt | 7 ------- .../normalizers/CMakeLists.txt | 14 +------------- 2 files changed, 1 insertion(+), 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