diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-03-22 01:15:05 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-03-22 01:15:05 +0100 |
| commit | d317a324c1c9fbc827f195f648a7a86dc17f89a1 (patch) | |
| tree | c9ad194010fef26dd530e025db254001eb54a40a | |
| parent | 28aa3884766bb09485428ce0c91104f7129b8145 (diff) | |
| download | gmrf-d317a324c1c9fbc827f195f648a7a86dc17f89a1.tar gmrf-d317a324c1c9fbc827f195f648a7a86dc17f89a1.zip | |
Revert "Require libsqlite3"
This reverts commit 28aa3884766bb09485428ce0c91104f7129b8145.
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | mmss/CMakeLists.txt | 6 |
2 files changed, 1 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 662913a..6509ceb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,11 +4,6 @@ project(GMRF C CXX) set(CMAKE_MODULE_PATH ${GMRF_SOURCE_DIR}) find_package(BISON 2.5 REQUIRED) -find_package(PkgConfig REQUIRED) - - -pkg_check_modules(SQLITE REQUIRED sqlite3) - add_subdirectory(mmss) add_subdirectory(mmss-protocol) diff --git a/mmss/CMakeLists.txt b/mmss/CMakeLists.txt index 470ae00..4823bce 100644 --- a/mmss/CMakeLists.txt +++ b/mmss/CMakeLists.txt @@ -1,5 +1,4 @@ include_directories(${GMRF_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) -link_directories(${SQLITE_LIBRARY_DIRS}) set_directory_properties(PROPERTIES COMPILE_DEFINITIONS _GNU_SOURCE) BISON_TARGET(mmss_config_parse config.y ${CMAKE_CURRENT_BINARY_DIR}/config.yy.cpp) @@ -19,7 +18,4 @@ add_executable(mmss ${BISON_mmss_config_parse_OUTPUTS} ) target_link_libraries(mmss dl) -set_property(TARGET mmss PROPERTY COMPILE_FLAGS "-std=c++11 ${SQLITE_CFLAGS_OTHER} -Wall") -set_property(TARGET mmss PROPERTY LINK_FLAGS "${SQLITE_LDFLAGS_OTHER}") -set_property(TARGET mmss APPEND PROPERTY INCLUDE_DIRECTORIES ${SQLITE_INCLUDE_DIRS}) -target_link_libraries(mmss ${SQLITE_LIBRARIES}) +set_target_properties(mmss PROPERTIES COMPILE_FLAGS "-std=c++11 -Wall") |