diff options
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 237257590..15f1a3e95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,7 +188,7 @@ set(SQLITECPP_RUN_CPPCHECK OFF CACHE BOOL "Run cppcheck C++ static analysis t set(SQLITECPP_RUN_DOXYGEN OFF CACHE BOOL "Run Doxygen C++ documentation tool." FORCE) set(SQLITECPP_BUILD_EXAMPLES OFF CACHE BOOL "Build examples." FORCE) set(SQLITECPP_BUILD_TESTS OFF CACHE BOOL "Build and run tests." FORCE) -set(SQLITECPP_INTERNAL_SQLITE OFF CACHE BOOL "Add the internal SQLite3 source to the project." FORCE) +set(SQLITECPP_INTERNAL_SQLITE ON CACHE BOOL "Add the internal SQLite3 source to the project." FORCE) set(SQLITE_ENABLE_COLUMN_METADATA OFF CACHE BOOL "" FORCE) # Set options for LibEvent, disable all their tests and benchmarks: @@ -251,29 +251,26 @@ endif() # Include all the libraries: -add_subdirectory(lib/jsoncpp/) +add_subdirectory(lib/jsoncpp/ EXCLUDE_FROM_ALL) add_subdirectory(lib/zlib/) add_subdirectory(lib/lua/) add_subdirectory(lib/tolua++/ EXCLUDE_FROM_ALL) -add_subdirectory(lib/sqlite/) add_subdirectory(lib/SQLiteCpp/) +add_subdirectory(lib/sqlite/) add_subdirectory(lib/expat/) add_subdirectory(lib/luaexpat/) add_subdirectory(lib/libevent/ EXCLUDE_FROM_ALL) add_subdirectory(lib/fmt) -# Add proper include directories so that SQLiteCpp can find SQLite3: -get_property(SQLITECPP_INCLUDES DIRECTORY "lib/SQLiteCpp/" PROPERTY INCLUDE_DIRECTORIES) -set(SQLITECPP_INCLUDES "${SQLITECPP_INCLUDES}" "${CMAKE_CURRENT_SOURCE_DIR}/lib/sqlite/") -set_property(DIRECTORY lib/SQLiteCpp/ PROPERTY INCLUDE_DIRECTORIES "${SQLITECPP_INCLUDES}") -set_property(TARGET SQLiteCpp PROPERTY INCLUDE_DIRECTORIES "${SQLITECPP_INCLUDES}") - # Add proper includes for LibEvent's event-config.h header: include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) -# Prettify jsoncpp_lib_static name in VS solution explorer -set_property(TARGET jsoncpp_lib_static PROPERTY PROJECT_LABEL "jsoncpp") +# Prettify jsoncpp_lib name in VS solution explorer +set_property(TARGET jsoncpp_lib PROPERTY PROJECT_LABEL "jsoncpp") +# jsoncpp uses these for ccache support, clashing with our method +set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "") +set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "") if (WIN32) add_subdirectory(lib/luaproxy/) @@ -306,13 +303,13 @@ if (MSVC) event_extra_static expat fmt - jsoncpp_lib_static + jsoncpp_lib lua luaexpat mbedcrypto mbedtls mbedx509 - sqlite + lsqlite SQLiteCpp tolualib zlib |