null+****@clear*****
null+****@clear*****
2012年 5月 16日 (水) 23:19:32 JST
Kouhei Sutou 2012-05-16 23:19:32 +0900 (Wed, 16 May 2012)
New Revision: ec7f94e6ba3baa1abe07c15b2f479ca414f59048
Log:
cmake: use target name instead of shared library path
Modified files:
CMakeLists.txt
src/CMakeLists.txt
src/suggest/CMakeLists.txt
Modified: CMakeLists.txt (+0 -4)
===================================================================
--- CMakeLists.txt 2012-05-16 23:14:07 +0900 (873936e)
+++ CMakeLists.txt 2012-05-16 23:19:32 +0900 (3c2da5f)
@@ -253,10 +253,6 @@ else()
set(WITH_MESSAGE_PACK FALSE)
endif()
-set(LIBGROONGA_BASE_NAME
- "${CMAKE_SHARED_LIBRARY_PREFIX}groonga${CMAKE_SHARED_LIBRARY_SUFFIX}")
-set(LIBGROONGA "${CMAKE_BINARY_DIR}/lib/${LIBGROONGA_BASE_NAME}")
-
add_subdirectory(lib)
add_subdirectory(src)
add_subdirectory(plugins)
Modified: src/CMakeLists.txt (+3 -3)
===================================================================
--- src/CMakeLists.txt 2012-05-16 23:14:07 +0900 (abde2e7)
+++ src/CMakeLists.txt 2012-05-16 23:19:32 +0900 (64b9d03)
@@ -17,16 +17,16 @@ add_subdirectory(suggest)
read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/groonga_sources.am GROONGA_SOURCES)
add_executable(groonga ${GROONGA_SOURCES})
-target_link_libraries(groonga ${LIBGROONGA})
+target_link_libraries(groonga libgroonga)
read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/grnslap_sources.am GRNSLAP_SOURCES)
add_executable(grnslap ${GRNSLAP_SOURCES})
-target_link_libraries(grnslap ${LIBGROONGA})
+target_link_libraries(grnslap libgroonga)
read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/groonga_benchmark_sources.am
GROONGA_BENCHMARK_SOURCES)
add_executable(groonga-benchmark ${GROONGA_BENCHMARK_SOURCES})
-target_link_libraries(groonga-benchmark ${LIBGROONGA})
+target_link_libraries(groonga-benchmark libgroonga)
install(TARGETS groonga grnslap groonga-benchmark
DESTINATION ${BIN_DIR})
Modified: src/suggest/CMakeLists.txt (+3 -3)
===================================================================
--- src/suggest/CMakeLists.txt 2012-05-16 23:14:07 +0900 (8178d3f)
+++ src/suggest/CMakeLists.txt 2012-05-16 23:19:32 +0900 (b90784e)
@@ -17,7 +17,7 @@ read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/create_dataset_sources.am
GROONGA_SUGGEST_CREATE_DATASET_SOURCES)
add_executable(groonga-suggest-create-dataset
${GROONGA_SUGGEST_CREATE_DATASET_SOURCES})
-target_link_libraries(groonga-suggest-create-dataset ${LIBGROONGA})
+target_link_libraries(groonga-suggest-create-dataset libgroonga)
install(
TARGETS groonga-suggest-create-dataset
DESTINATION ${BIN_DIR})
@@ -50,7 +50,7 @@ if(WITH_SUGGEST_LEARNER)
add_executable(groonga-suggest-learner ${GROONGA_SUGGEST_LEARNER_SOURCES})
target_link_libraries(groonga-suggest-learner
groonga-suggest-util
- ${LIBGROONGA}
+ libgroonga
${LIBEVENT_LIBRARIES}
${ZEROMQ_LIBRARIES}
${MESSAGE_PACK_LIBRARIES})
@@ -60,7 +60,7 @@ if(WITH_SUGGEST_LEARNER)
add_executable(groonga-suggest-httpd ${GROONGA_SUGGEST_HTTPD_SOURCES})
target_link_libraries(groonga-suggest-httpd
groonga-suggest-util
- ${LIBGROONGA}
+ libgroonga
${LIBEVENT_LIBRARIES}
${ZEROMQ_LIBRARIES}
${MESSAGE_PACK_LIBRARIES})