thomasave
/
Parsodus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

G3log from CMake

This commit is contained in:
Thomas Avé 2017-01-26 20:59:17 +01:00
parent 14c04d94e6
commit 4eb9451235
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@ -6,6 +6,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED 14)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
find_package(Threads)
include(ExternalProject) include(ExternalProject)
find_package(mstch QUIET) find_package(mstch QUIET)
@ -39,6 +41,27 @@ ExternalProject_Add(ext-optparse
ExternalProject_Get_Property(ext-optparse source_dir) ExternalProject_Get_Property(ext-optparse source_dir)
include_directories(${source_dir}) include_directories(${source_dir})
set(OLD_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
find_package(G3LOG QUIET)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_SUFFIXES})
if(NOT G3LOG_FOUND)
ExternalProject_Add(ext-g3log
GIT_REPOSITORY https://github.com/KjellKod/g3log
INSTALL_COMMAND ""
)
ExternalProject_Get_Property(ext-g3log source_dir binary_dir)
set(G3LOG_INCLUDE_DIR "${source_dir}/src")
add_library(g3logger IMPORTED STATIC GLOBAL)
set(G3LOG_LIBRARY g3logger)
add_dependencies(g3logger ext-g3log)
set_target_properties(g3logger PROPERTIES "IMPORTED_LOCATION" "${binary_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}g3logger${CMAKE_STATIC_LIBRARY_SUFFIX}")
include_directories(${source_dir}/include)
endif()
include_directories(${G3LOG_INCLUDE_DIR})
find_package(Lexesis QUIET) find_package(Lexesis QUIET)
if (NOT LEXESIS_FOUND) if (NOT LEXESIS_FOUND)
#Lexesis #Lexesis
@ -141,5 +164,3 @@ install(DIRECTORY templates
install(DIRECTORY include/Parsodus install(DIRECTORY include/Parsodus
DESTINATION include) DESTINATION include)
# add_subdirectory(examples)

1
README.md
View File

@ -42,6 +42,7 @@ The following dependencies will be automatically downloaded with git while build
* [mstch](https://github.com/no1msd/mstch) * [mstch](https://github.com/no1msd/mstch)
* [optparse](https://github.com/myint/optparse) * [optparse](https://github.com/myint/optparse)
* [g3log](https://github.com/KjellKod/g3log)
* Lexesis * Lexesis
## Building ## Building

2
src/CMakeLists.txt
View File

@ -48,6 +48,8 @@ target_link_libraries(Parsodus
templ templ
pds pds
mstch::mstch mstch::mstch
${G3LOG_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
) )
install(TARGETS Parsodus pds Parsodus-util Parsodus-tables install(TARGETS Parsodus pds Parsodus-util Parsodus-tables

2
tests/CMakeLists.txt
View File

@ -8,6 +8,8 @@ target_link_libraries(Parsodus-test
Parsodus-util Parsodus-util
pds pds
${GTEST_BOTH_LIBRARIES} ${GTEST_BOTH_LIBRARIES}
${G3LOG_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
) )
include(FindGTest) include(FindGTest)
GTEST_ADD_TESTS(Parsodus-test "" AUTO) GTEST_ADD_TESTS(Parsodus-test "" AUTO)