null+****@clear*****
null+****@clear*****
2012年 4月 12日 (木) 15:19:16 JST
Kouhei Sutou 2012-04-12 15:19:16 +0900 (Thu, 12 Apr 2012)
New Revision: 0f2e11efba8887d81bffa7864ee03425796966bf
Log:
cmake: add missing build flags
Modified files:
CMakeLists.txt
lib/CMakeLists.txt
Modified: CMakeLists.txt (+7 -3)
===================================================================
--- CMakeLists.txt 2012-04-12 15:09:43 +0900 (69f9832)
+++ CMakeLists.txt 2012-04-12 15:19:16 +0900 (8ecd627)
@@ -20,13 +20,17 @@ file(READ base_version GRN_VERSION)
include(CheckIncludeFile)
-add_subdirectory(lib)
-
add_definitions(
-DHAVE_CONFIG_H
-DGROONGA_VERSION=\"${GROONGA_VERSION}\"
)
-add_definitions(-DGROONGA_VERSION=\"${GROONGA_VERSION}\")
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_SOURCE_DIR}/include
+ )
+
+add_subdirectory(lib)
macro(ac_check_headers header)
string(REGEX REPLACE "[/.]" "_" output_variable_name ${header})
Modified: lib/CMakeLists.txt (+0 -1)
===================================================================
--- lib/CMakeLists.txt 2012-04-12 15:09:43 +0900 (253e7af)
+++ lib/CMakeLists.txt 2012-04-12 15:19:16 +0900 (73d0330)
@@ -14,7 +14,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
include_directories(
- ${CMAKE_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/dat
)