neocturne/gmrf
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Require libsqlite3"

Browse source 
This reverts commit 28aa388476.
This commit is contained in:
Matthias Schiffer 2014-03-22 01:15:05 +01:00
parent 28aa388476
commit d317a324c1
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -4,11 +4,6 @@ project(GMRF C CXX)
set(CMAKE_MODULE_PATH ${GMRF_SOURCE_DIR}) set(CMAKE_MODULE_PATH ${GMRF_SOURCE_DIR})
find_package(BISON 2.5 REQUIRED) find_package(BISON 2.5 REQUIRED)
find_package(PkgConfig REQUIRED)
pkg_check_modules(SQLITE REQUIRED sqlite3)
add_subdirectory(mmss) add_subdirectory(mmss)
add_subdirectory(mmss-protocol) add_subdirectory(mmss-protocol)

6
mmss/CMakeLists.txt
View file

@ -1,5 +1,4 @@
include_directories(${GMRF_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) 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) set_directory_properties(PROPERTIES COMPILE_DEFINITIONS _GNU_SOURCE)
BISON_TARGET(mmss_config_parse config.y ${CMAKE_CURRENT_BINARY_DIR}/config.yy.cpp) 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} ${BISON_mmss_config_parse_OUTPUTS}
) )
target_link_libraries(mmss dl) target_link_libraries(mmss dl)
set_property(TARGET mmss PROPERTY COMPILE_FLAGS "-std=c++11 ${SQLITE_CFLAGS_OTHER} -Wall") set_target_properties(mmss PROPERTIES COMPILE_FLAGS "-std=c++11 -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})