]>
Commit | Line | Data |
---|---|---|
8a8f9fb3 AM |
1 | From b60702e0b7041c56a3cb52c209204d28406f3ce5 Mon Sep 17 00:00:00 2001 |
2 | From: Raphael Kubo da Costa <rakuco@FreeBSD.org> | |
3 | Date: Wed, 13 Aug 2014 14:43:04 +0300 | |
4 | Subject: [PATCH 01/30] FindSqlite: Use CMAKE_FLAGS the right way in | |
5 | try_compile(). | |
6 | ||
7 | This fixes f90774f1 ("Check whether Sqlite is compiled with | |
8 | SQLITE_ENABLE_UNLOCK_NOTIFY"), so that SQLITE_INCLUDE_DIR is really | |
9 | passed to the try_compile() call. So far, it was just a NOP and the | |
10 | compilation only worked if sqlite3.h was in a directory the compiler | |
11 | uses automatically. | |
12 | ||
13 | try_compile()'s syntax is a bit complicated, and CMAKE_FLAGS expects a | |
14 | series of arguments as if they had been passed to the command line, so | |
15 | instead of "CMAKE_FLAGS INCLUDE_DIRECTORIES /some/dir" one needs to use | |
16 | "CMAKE_FLAGS -DINCLUDE_DIRECTORIES:PATH=/some/dir". | |
17 | ||
18 | REVIEW: 119762 | |
19 | --- | |
20 | cmake/modules/FindSqlite.cmake | 2 +- | |
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
22 | ||
23 | diff --git a/cmake/modules/FindSqlite.cmake b/cmake/modules/FindSqlite.cmake | |
24 | index ad8cdb4..c43a7b5 100644 | |
25 | --- a/cmake/modules/FindSqlite.cmake | |
26 | +++ b/cmake/modules/FindSqlite.cmake | |
27 | @@ -94,7 +94,7 @@ if(EXISTS ${SQLITE_INCLUDE_DIR}/sqlite3.h) | |
28 | ${CMAKE_BINARY_DIR}/sqlite_check_unlock_notify | |
29 | ${CMAKE_BINARY_DIR}/sqlite_check_unlock_notify.cpp | |
30 | LINK_LIBRARIES ${SQLITE_LIBRARIES} | |
31 | - CMAKE_FLAGS INCLUDE_DIRECTORIES ${SQLITE_INCLUDE_DIR}) | |
32 | + CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${SQLITE_INCLUDE_DIR}") | |
33 | if (NOT SQLITE_HAS_UNLOCK_NOTIFY) | |
34 | message(STATUS "Sqlite ${SQLITE_VERSION} was found, but it is not compiled with -DSQLITE_ENABLE_UNLOCK_NOTIFY") | |
35 | endif() | |
36 | -- | |
37 | 2.1.0 | |
38 |