From 3f088e7b3a1467a88e7c5ff9fb60dc4609d2bfa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Fri, 16 Mar 2018 01:12:54 +0100 Subject: C++17 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b3f292..898e03a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ find_library(LIBUBSAN NAMES ubsan libubsan.so.0) # ## Set various debug flags (instrumentation libs, coverage, …) # -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -pedantic -Wall -Wextra -Wconversion -fvisibility=hidden -fvisibility-inlines-hidden") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z -pedantic -Wall -Wextra -Wconversion -fvisibility=hidden -fvisibility-inlines-hidden") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage --coverage") endif() -- cgit v1.2.3 From 86f275e111d2fb18a2b55b87fd4e54a06d852816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sat, 17 Mar 2018 17:28:49 +0100 Subject: Revert "C++17" This reverts commit 3f088e7b3a1467a88e7c5ff9fb60dc4609d2bfa3. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 898e03a..2b3f292 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ find_library(LIBUBSAN NAMES ubsan libubsan.so.0) # ## Set various debug flags (instrumentation libs, coverage, …) # -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1z -pedantic -Wall -Wextra -Wconversion -fvisibility=hidden -fvisibility-inlines-hidden") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -pedantic -Wall -Wextra -Wconversion -fvisibility=hidden -fvisibility-inlines-hidden") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage --coverage") endif() -- cgit v1.2.3 From ad7aa5b7090f093a8a167a3fcb29c421881946f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sun, 18 Mar 2018 02:12:25 +0100 Subject: =?UTF-8?q?Use=20Catch2=E2=80=99s=20single=5Finclude/=20directory?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b3f292..6d36e1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -318,7 +318,7 @@ set_target_properties(catch PROPERTIES EXCLUDE_FROM_ALL TRUE) ExternalProject_Get_Property(catch SOURCE_DIR) if(NOT EXISTS ${CMAKE_SOURCE_DIR}/tests/catch.hpp) target_include_directories(test_suite - PUBLIC "${SOURCE_DIR}/include/" + PUBLIC "${SOURCE_DIR}/single_include/" ) add_dependencies(test_suite catch) endif() -- cgit v1.2.3 From 08fabd0a10f01dab3971398768a32e6fef177434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Wed, 2 May 2018 19:44:59 +0200 Subject: Release version 8.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d36e1c..1112f0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(biboumi) set(${PROJECT_NAME}_VERSION_MAJOR 8) set(${PROJECT_NAME}_VERSION_MINOR 0) -set(${PROJECT_NAME}_VERSION_SUFFIX "~dev") +set(${PROJECT_NAME}_VERSION_SUFFIX "") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) -- cgit v1.2.3 From edcd80cca12b45bd79a631f6c421a6cfce9c17f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Wed, 2 May 2018 20:22:48 +0200 Subject: Start version 9.0 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1112f0a..1d57a0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.0) project(biboumi) -set(${PROJECT_NAME}_VERSION_MAJOR 8) +set(${PROJECT_NAME}_VERSION_MAJOR 9) set(${PROJECT_NAME}_VERSION_MINOR 0) -set(${PROJECT_NAME}_VERSION_SUFFIX "") +set(${PROJECT_NAME}_VERSION_SUFFIX "~dev") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) -- cgit v1.2.3 From e3730c5a40a9d4a098ae9fb9a3bd867803007da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Fri, 8 Jun 2018 19:13:00 +0200 Subject: =?UTF-8?q?Don=E2=80=99t=20add=5Flibrary(database)=20with=20an=20e?= =?UTF-8?q?mpty=20string,=20that=E2=80=99s=20not=20portable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead, don’t create the library at all if not needed. --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d57a0b..7539886 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,8 +218,6 @@ if(SQLITE3_FOUND OR PQ_FOUND) include_directories(database ${PQ_INCLUDE_DIRS}) endif() set(USE_DATABASE TRUE) -else() - add_library(database OBJECT "") endif() # @@ -235,8 +233,7 @@ add_executable(${PROJECT_NAME} src/main.cpp $ $ $ - $ - $) + $) ## test_suite file(GLOB source_tests @@ -249,9 +246,12 @@ add_executable(test_suite ${source_tests} $ $ $ - $ - $) + $) set_target_properties(test_suite PROPERTIES EXCLUDE_FROM_ALL TRUE) +if(USE_DATABASE) + target_link_libraries(${PROJECT_NAME} $) + target_link_libraries(test_suite $) +endif() # ## Link the executables with their libraries -- cgit v1.2.3 From 72c3324cf38f0173676f123ed4d8e3418c66f14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Fri, 8 Jun 2018 20:03:55 +0200 Subject: Correctly use target_sources instead of target_link_libraries --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7539886..c6ac616 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,8 +249,8 @@ add_executable(test_suite ${source_tests} $) set_target_properties(test_suite PROPERTIES EXCLUDE_FROM_ALL TRUE) if(USE_DATABASE) - target_link_libraries(${PROJECT_NAME} $) - target_link_libraries(test_suite $) + target_sources(${PROJECT_NAME} PRIVATE $) + target_sources(test_suite PRIVATE $) endif() # -- cgit v1.2.3 From c70b97d761ffba40e1c494bd9a78b9b278fbcb97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Tue, 28 Aug 2018 23:24:24 +0200 Subject: Use sphinx instead of pandoc, and add a deploy job --- CMakeLists.txt | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index c6ac616..e217171 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,26 +74,8 @@ set(SOFTWARE_VERSION # ## The rule that generates the documentation # -execute_process(COMMAND "date" "+%Y-%m-%d" OUTPUT_VARIABLE DOC_DATE - OUTPUT_STRIP_TRAILING_WHITESPACE) -set(MAN_PAGE ${CMAKE_CURRENT_BINARY_DIR}/doc/${PROJECT_NAME}.1) -set(DOC_PAGE ${CMAKE_CURRENT_SOURCE_DIR}/doc/${PROJECT_NAME}.1.rst) -if (NOT PANDOC_EXECUTABLE) - find_program(PANDOC_EXECUTABLE NAMES pandoc - DOC "The pandoc software, to build the man page from the rst documentation") - if(PANDOC_EXECUTABLE) - message(STATUS "Found Pandoc: ${PANDOC_EXECUTABLE}") - set(WITH_DOC true) - file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/) - add_custom_command(OUTPUT ${MAN_PAGE} - COMMAND ${PANDOC_EXECUTABLE} -M date="${DOC_DATE}" -s -t man ${DOC_PAGE} -o ${MAN_PAGE} - DEPENDS ${DOC_PAGE}) - add_custom_target(doc ALL DEPENDS ${MAN_PAGE}) - else() - message(STATUS "Pandoc not found, documentation cannot be built") - endif() -endif() -mark_as_advanced(PANDOC_EXECUTABLE) +add_custom_target(doc COMMAND make html BUILDDIR=${CMAKE_CURRENT_BINARY_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc) # ## Set this search path for cmake, to find our custom search modules -- cgit v1.2.3