null+****@clear*****
null+****@clear*****
2012年 4月 16日 (月) 22:21:54 JST
Kouhei Sutou 2012-04-16 22:21:54 +0900 (Mon, 16 Apr 2012)
New Revision: 0937a5dcb713d3bb5cb4fcbcc33c7518357768a3
Log:
cmake: don't include the same file two or more
Modified files:
CMakeLists.txt
lib/CMakeLists.txt
plugins/suggest/CMakeLists.txt
plugins/tokenizers/CMakeLists.txt
src/CMakeLists.txt
src/suggest/CMakeLists.txt
Modified: CMakeLists.txt (+1 -0)
===================================================================
--- CMakeLists.txt 2012-04-16 22:19:29 +0900 (b39310c)
+++ CMakeLists.txt 2012-04-16 22:21:54 +0900 (3d04fb8)
@@ -31,6 +31,7 @@ include(CheckIncludeFile)
include(CheckFunctionExists)
include(CheckLibraryExists)
include(FindPkgConfig)
+include(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake)
set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
set(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
Modified: lib/CMakeLists.txt (+0 -2)
===================================================================
--- lib/CMakeLists.txt 2012-04-16 22:19:29 +0900 (720f650)
+++ lib/CMakeLists.txt 2012-04-16 22:21:54 +0900 (ca4a89f)
@@ -17,8 +17,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/dat
)
-include(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake)
-
read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/sources.am LIBGROONGA_SOURCES)
read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/dat/sources.am LIBGRNDAT_SOURCES)
string(REGEX REPLACE "([^;]+)" "dat/\\1"
Modified: plugins/suggest/CMakeLists.txt (+0 -2)
===================================================================
--- plugins/suggest/CMakeLists.txt 2012-04-16 22:19:29 +0900 (332f526)
+++ plugins/suggest/CMakeLists.txt 2012-04-16 22:21:54 +0900 (003b2c0)
@@ -13,8 +13,6 @@
# 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(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake)
-
include_directories(
${CMAKE_SOURCE_DIR}/lib
)
Modified: plugins/tokenizers/CMakeLists.txt (+0 -2)
===================================================================
--- plugins/tokenizers/CMakeLists.txt 2012-04-16 22:19:29 +0900 (522e097)
+++ plugins/tokenizers/CMakeLists.txt 2012-04-16 22:21:54 +0900 (f0cacfc)
@@ -13,8 +13,6 @@
# 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(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake)
-
include_directories(
${CMAKE_SOURCE_DIR}/lib
)
Modified: src/CMakeLists.txt (+0 -2)
===================================================================
--- src/CMakeLists.txt 2012-04-16 22:19:29 +0900 (e09bbaa)
+++ src/CMakeLists.txt 2012-04-16 22:21:54 +0900 (abde2e7)
@@ -13,8 +13,6 @@
# 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(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake)
-
add_subdirectory(suggest)
read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/groonga_sources.am GROONGA_SOURCES)
Modified: src/suggest/CMakeLists.txt (+0 -2)
===================================================================
--- src/suggest/CMakeLists.txt 2012-04-16 22:19:29 +0900 (cb64529)
+++ src/suggest/CMakeLists.txt 2012-04-16 22:21:54 +0900 (8178d3f)
@@ -13,8 +13,6 @@
# 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(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake)
-
read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/create_dataset_sources.am
GROONGA_SUGGEST_CREATE_DATASET_SOURCES)
add_executable(groonga-suggest-create-dataset