Kouhei Sutou
null+****@clear*****
Thu Apr 25 12:15:57 JST 2013
Kouhei Sutou 2013-04-25 12:15:57 +0900 (Thu, 25 Apr 2013) New Revision: 69d4fe9bbbe6b9aa6e818d0d878b5c2418b9f61a https://github.com/groonga/groonga/commit/69d4fe9bbbe6b9aa6e818d0d878b5c2418b9f61a Message: cmake: use relative path for include paths Now we support bundled build! Modified files: plugins/query_expanders/CMakeLists.txt plugins/suggest/CMakeLists.txt plugins/table/CMakeLists.txt plugins/tokenizers/CMakeLists.txt src/suggest/CMakeLists.txt Modified: plugins/query_expanders/CMakeLists.txt (+2 -2) =================================================================== --- plugins/query_expanders/CMakeLists.txt 2013-04-25 12:12:22 +0900 (a2f1a48) +++ plugins/query_expanders/CMakeLists.txt 2013-04-25 12:15:57 +0900 (71aac68) @@ -1,4 +1,4 @@ -# Copyright(C) 2012 Brazil +# Copyright(C) 2012-2013 Brazil # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,7 +14,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA include_directories( - ${CMAKE_SOURCE_DIR}/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../../lib ) set(QUERY_EXPANDERS_DIR "${GRN_PLUGINS_DIR}/query_expanders") Modified: plugins/suggest/CMakeLists.txt (+2 -2) =================================================================== --- plugins/suggest/CMakeLists.txt 2013-04-25 12:12:22 +0900 (b72b0bf) +++ plugins/suggest/CMakeLists.txt 2013-04-25 12:15:57 +0900 (05002c6) @@ -1,4 +1,4 @@ -# Copyright(C) 2012 Brazil +# Copyright(C) 2012-2013 Brazil # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,7 +14,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA include_directories( - ${CMAKE_SOURCE_DIR}/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../../lib ) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/sources.am SUGGEST_SOURCES) Modified: plugins/table/CMakeLists.txt (+2 -2) =================================================================== --- plugins/table/CMakeLists.txt 2013-04-25 12:12:22 +0900 (f1d261a) +++ plugins/table/CMakeLists.txt 2013-04-25 12:15:57 +0900 (119a9bd) @@ -1,4 +1,4 @@ -# Copyright(C) 2012 Brazil +# Copyright(C) 2012-2013 Brazil # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,7 +14,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA include_directories( - ${CMAKE_SOURCE_DIR}/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../../lib ) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/sources.am TABLE_SOURCES) Modified: plugins/tokenizers/CMakeLists.txt (+2 -2) =================================================================== --- plugins/tokenizers/CMakeLists.txt 2013-04-25 12:12:22 +0900 (d38cccd) +++ plugins/tokenizers/CMakeLists.txt 2013-04-25 12:15:57 +0900 (b5274f8) @@ -1,4 +1,4 @@ -# Copyright(C) 2012 Brazil +# Copyright(C) 2012-2013 Brazil # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,7 +14,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA include_directories( - ${CMAKE_SOURCE_DIR}/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../../lib ) set(TOKENIZERS_DIR "${GRN_PLUGINS_DIR}/tokenizers") Modified: src/suggest/CMakeLists.txt (+2 -2) =================================================================== --- src/suggest/CMakeLists.txt 2013-04-25 12:12:22 +0900 (61bf9cc) +++ src/suggest/CMakeLists.txt 2013-04-25 12:15:57 +0900 (786f27c) @@ -1,4 +1,4 @@ -# Copyright(C) 2012 Brazil +# Copyright(C) 2012-2013 Brazil # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -13,7 +13,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -include_directories(${CMAKE_SOURCE_DIR}/lib) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../lib) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/create_dataset_sources.am GROONGA_SUGGEST_CREATE_DATASET_SOURCES) -------------- next part -------------- HTML����������������������������...Download