[Groonga-mysql-commit] mroonga/mroonga [master] Downcase commands

Back to archive index

null+****@clear***** null+****@clear*****
2012年 3月 20日 (火) 18:44:02 JST


Kouhei Sutou	2012-03-20 18:44:02 +0900 (Tue, 20 Mar 2012)

  New Revision: 7cd21ef4be44e24e65de65b21b6da0d817eb8597

  Log:
    Downcase commands

  Modified files:
    CMakeLists.txt

  Modified: CMakeLists.txt (+48 -48)
===================================================================
--- CMakeLists.txt    2012-03-20 16:54:02 +0900 (3b64441)
+++ CMakeLists.txt    2012-03-20 18:44:02 +0900 (8bcb60c)
@@ -14,19 +14,19 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(mroonga)
+cmake_minimum_required(VERSION 2.6)
+project(mroonga)
 
-SET(MRN_VERSION_MAJOR 2)
-SET(MRN_VERSION_MINOR 0)
-SET(MRN_VERSION_MICRO 1)
-SET(MRN_VERSION "${MRN_VERSION_MAJOR}.${MRN_VERSION_MINOR}${MRN_VERSION_MICRO}")
+set(MRN_VERSION_MAJOR 2)
+set(MRN_VERSION_MINOR 0)
+set(MRN_VERSION_MICRO 1)
+set(MRN_VERSION "${MRN_VERSION_MAJOR}.${MRN_VERSION_MINOR}${MRN_VERSION_MICRO}")
 # TODO: FIXME
-SET(MRN_VERSION_IN_HEX
+set(MRN_VERSION_IN_HEX
   "0x0${MRN_VERSION_MAJOR}${MRN_VERSION_MINOR}${MRN_VERSION_MICRO}")
-SET(MRN_PACKAGE_STRING "${PROJECT_NAME} ${MRN_VERSION}")
+set(MRN_PACKAGE_STRING "${PROJECT_NAME} ${MRN_VERSION}")
 
-SET(MROONGA_C_SOURCES
+set(MROONGA_C_SOURCES
   mrn_sys.c
   mrn_sys.h
 
@@ -35,7 +35,7 @@ SET(MROONGA_C_SOURCES
   mrn_mysql.h
   mrn_mysql_compat.h
   )
-SET(MROONGA_CPP_SOURCES
+set(MROONGA_CPP_SOURCES
   ha_mroonga.cc
   ha_mroonga.h
   mrn_table.cc
@@ -43,68 +43,68 @@ SET(MROONGA_CPP_SOURCES
   lib/mrn_path_mapper.cpp
   lib/mrn_path_mapper.hpp
   )
-SET(MROONGA_SOURCES ${MROONGA_C_SOURCES} ${MROONGA_CPP_SOURCES})
+set(MROONGA_SOURCES ${MROONGA_C_SOURCES} ${MROONGA_CPP_SOURCES})
 
 # TODO: set VERSIONINFO for Microsoft Visual C++.
 #       http://msdn.microsoft.com/en-us/library/aa381058%28VS.85%29.aspx
-ADD_LIBRARY(ha_mroonga MODULE ${MROONGA_SOURCES})
-SET_TARGET_PROPERTIES(ha_mroonga PROPERTIES
+add_library(ha_mroonga MODULE ${MROONGA_SOURCES})
+set_target_properties(ha_mroonga PROPERTIES
   COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN"
   PREFIX ""
   OUTPUT_NAME "ha_mroonga")
-SET_SOURCE_FILES_PROPERTIES(${MROONGA_CPP_SOURCES} PROPERTIES
+set_source_files_properties(${MROONGA_CPP_SOURCES} PROPERTIES
   COMPILE_FLAGS "-Werror -fno-implicit-templates -fno-exceptions -fno-rtti -felide-constructors")
 
-INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(GROONGA REQUIRED "groonga >= 2.0.0")
-TARGET_LINK_LIBRARIES(ha_mroonga ${GROONGA_LIBRARIES})
+include(FindPkgConfig)
+pkg_check_modules(GROONGA REQUIRED "groonga >= 2.0.0")
+target_link_libraries(ha_mroonga ${GROONGA_LIBRARIES})
 
-OPTION(WITH_DEBUG "Enable debug options" OFF)
-IF(WITH_DEBUG)
-  SET_PROPERTY(TARGET ha_mroonga APPEND PROPERTY
+option(WITH_DEBUG "Enable debug options" OFF)
+if(WITH_DEBUG)
+  set_property(TARGET ha_mroonga APPEND PROPERTY
     COMPILE_DEFINITIONS "SAFE_MUTEX")
-ENDIF()
+endif()
 
-OPTION(WITH_DEBUG_FULL "Enable full debug options" OFF)
-IF(WITH_DEBUG_FULL)
-  SET_PROPERTY(TARGET ha_mroonga APPEND PROPERTY
+option(WITH_DEBUG_FULL "Enable full debug options" OFF)
+if(WITH_DEBUG_FULL)
+  set_property(TARGET ha_mroonga APPEND PROPERTY
     COMPILE_DEFINITIONS "SAFE_MUTEX" "SAFEMALLOC")
-ENDIF()
+endif()
 
-OPTION(DISABLE_FAST_MUTEXES "Force disabling fast mutex" OFF)
-IF(DISABLE_FAST_MUTEXES)
-  SET_PROPERTY(TARGET ha_mroonga APPEND PROPERTY
+option(DISABLE_FAST_MUTEXES "Force disabling fast mutex" OFF)
+if(DISABLE_FAST_MUTEXES)
+  set_property(TARGET ha_mroonga APPEND PROPERTY
     COMPILE_DEFINITIONS "FORCE_FAST_MUTEX_DISABLED=1")
-ENDIF()
+endif()
 
-SET(MYSQL_SOURCE_DIR "PATH" CACHE PATH "MySQL source directory")
-SET(MYSQL_INCLUDE_DIRS
+set(MYSQL_SOURCE_DIR "PATH" CACHE PATH "MySQL source directory")
+set(MYSQL_INCLUDE_DIRS
   "${MYSQL_SOURCE_DIR}/sql"
   "${MYSQL_SOURCE_DIR}/include"
   "${MYSQL_SOURCE_DIR}/regex"
   "${MYSQL_SOURCE_DIR}"
   CACHE INTERNAL "MySQL include directories")
 
-SET(MYSQL_BUILD_DIR ${MYSQL_SOURCE_DIR} CACHE PATH "MySQL build directory")
+set(MYSQL_BUILD_DIR ${MYSQL_SOURCE_DIR} CACHE PATH "MySQL build directory")
 
-SET(MYSQL_CONFIG "PATH" CACHE PATH "mysql-config command path")
-FIND_PATH(MYSQL_CONFIG "${MYSQL_CONFIG}")
+set(MYSQL_CONFIG "PATH" CACHE PATH "mysql-config command path")
+find_path(MYSQL_CONFIG "${MYSQL_CONFIG}")
 
-MACRO(SET_MYSQL_CONFIG_VALUE OPTION VARIABLE)
-  EXECUTE_PROCESS(COMMAND "${MYSQL_CONFIG}" ${OPTION}
+macro(SET_MYSQL_CONFIG_VALUE OPTION VARIABLE)
+  execute_process(COMMAND "${MYSQL_CONFIG}" ${OPTION}
     OUTPUT_VARIABLE MYSQL_CONFIG_OUTPUT)
-  STRING(STRIP ${MYSQL_CONFIG_OUTPUT} ${VARIABLE})
-ENDMACRO()
+  string(STRIP ${MYSQL_CONFIG_OUTPUT} ${VARIABLE})
+endmacro()
 
-SET_MYSQL_CONFIG_VALUE("--plugindir" MYSQL_PLUGIN_DIR)
-SET_MYSQL_CONFIG_VALUE("--cflags" MYSQL_CFLAGS)
-SET_MYSQL_CONFIG_VALUE("--version" MYSQL_VERSION)
+set_mysql_config_value("--plugindir" MYSQL_PLUGIN_DIR)
+set_mysql_config_value("--cflags" MYSQL_CFLAGS)
+set_mysql_config_value("--version" MYSQL_VERSION)
 
-SET(DEFAULT_PARSER "TokenBigram" CACHE STRING "The default fulltext parser")
-SET_PROPERTY(TARGET ha_mroonga APPEND PROPERTY
+set(DEFAULT_PARSER "TokenBigram" CACHE STRING "The default fulltext parser")
+set_property(TARGET ha_mroonga APPEND PROPERTY
   COMPILE_DEFINITIONS "MRN_PARSER_DEFAULT=\"${DEFAULT_PARSER}\"")
 
-INCLUDE_DIRECTORIES(
+include_directories(
   "${PROJECT_BINARY_DIR}"
   "${PROJECT_SOURCE_DIR}"
   "${PROJECT_SOURCE_DIR}/lib"
@@ -112,18 +112,18 @@ INCLUDE_DIRECTORIES(
   ${GROONGA_INCLUDE_DIRS}
   )
 
-LINK_DIRECTORIES(
+link_directories(
   ${GROONGA_LIBRARY_DIRS}
   )
 
-INSTALL(TARGETS ha_mroonga DESTINATION "${MYSQL_PLUGIN_DIR}")
+install(TARGETS ha_mroonga DESTINATION "${MYSQL_PLUGIN_DIR}")
 
-CONFIGURE_FILE (
+configure_file (
   "${PROJECT_SOURCE_DIR}/mrn_version.h.in"
   "${PROJECT_BINARY_DIR}/mrn_version.h"
   )
 
-CONFIGURE_FILE (
+configure_file (
   "${PROJECT_SOURCE_DIR}/config.sh.in"
   "${PROJECT_BINARY_DIR}/config.sh"
   )




Groonga-mysql-commit メーリングリストの案内
Back to archive index