Kouhei Sutou
null+****@clear*****
Sat Mar 23 01:11:16 JST 2013
Kouhei Sutou 2013-03-23 01:11:16 +0900 (Sat, 23 Mar 2013) New Revision: 5b09752e30cf1fda3c98b7f27a81402d465435ab https://github.com/groonga/groonga-normalizer-mysql/commit/5b09752e30cf1fda3c98b7f27a81402d465435ab Message: cmake: works! Modified files: .gitignore CMakeLists.txt Modified: .gitignore (+5 -0) =================================================================== --- .gitignore 2013-03-23 00:54:42 +0900 (4f5ac68) +++ .gitignore 2013-03-23 01:11:16 +0900 (f01eeea) @@ -1,17 +1,22 @@ .deps/ .libs/ +CMakeFiles/ *~ *.o +*.so *.lo *.la +CMakeCache.txt Makefile Makefile.in +cmake_install.cmake /aclocal.m4 /autom4te.cache/ /config.* /configure /depcomp /install-sh +/install_manifest.txt /libtool /ltmain.sh /m4/ Modified: CMakeLists.txt (+9 -6) =================================================================== --- CMakeLists.txt 2013-03-23 00:54:42 +0900 (989cc25) +++ CMakeLists.txt 2013-03-23 01:11:16 +0900 (43f86f1) @@ -23,7 +23,7 @@ file(READ "${CMAKE_SOURCE_DIR}/version" VERSION) include(FindPkgConfig) include(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake) -file(READ ${CAMKE_SOURCE_DIR}/required_groonga_version GROONGA_REQUIRED_VERSION) +file(READ ${CMAKE_SOURCE_DIR}/required_groonga_version GROONGA_REQUIRED_VERSION) string(STRIP "${GROONGA_REQUIRED_VERSION}" GROONGA_REQUIRED_VERSION) pkg_check_modules(GROONGA REQUIRED "groonga >= ${GROONGA_REQUIRED_VERSION}") @@ -35,7 +35,7 @@ add_definitions( include_directories( ${CMAKE_BINARY_DIR} - ${GROOGNA_INCLUDE_DIRS} + ${GROONGA_INCLUDE_DIRS} ) link_directories( @@ -44,8 +44,11 @@ link_directories( add_subdirectory(normalizers) -configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) +configure_file( + groonga-normalizer-mysql.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/groonga-normalizer-mysql.pc + @ONLY) -configure_file(groonga.pc.in ${CMAKE_CURRENT_BINARY_DIR}/groonga.pc @ONLY) - -install(FILES groonga-normalizer-mysql.pc DESTINATION "${LIB_DIR}/pkgconfig/") +install( + FILES groonga-normalizer-mysql.pc + DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/") -------------- next part -------------- HTML����������������������������...Download