mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean the list of options visible in non-advanced ccmake

Browse Source
This commit is contained in:
louiz’
2016-07-12 11:57:01 +02:00
parent f212b47830
commit 2307f94e5b
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+11 -6
View File
@@ -80,6 +80,7 @@ if (NOT PANDOC_EXECUTABLE)
message(STATUS "Pandoc not found, documentation cannot be built") message(STATUS "Pandoc not found, documentation cannot be built")
endif() endif()
endif() endif()
mark_as_advanced(PANDOC_EXECUTABLE)
# Look for litesql and enable the database if found # Look for litesql and enable the database if found
if(WITH_LITESQL) if(WITH_LITESQL)
@@ -280,18 +281,22 @@ add_custom_target(PrintBuildParameters ALL
configure_file(biboumi.h.cmake src/biboumi.h) configure_file(biboumi.h.cmake src/biboumi.h)
set(SYSTEMD_SERVICE_TYPE_DOCSTRING "The value used as the Type= in the systemd unit file.")
set(WATCHDOG_SEC_DOCSTRING "The value used as WatchdogSec= in the systemd unit file.")
if(SYSTEMD_FOUND) if(SYSTEMD_FOUND)
set(SYSTEMD_SERVICE_TYPE "notify") set(SYSTEMD_SERVICE_TYPE "notify" CACHE STRING SYSTEMD_SERVICE_TYPE_DOCSTRING)
set(WATCHDOG_SEC "20") set(WATCHDOG_SEC "20" CACHE STRING WATCHDOG_SEC_DOCSTRING)
else() else()
set(SYSTEMD_SERVICE_TYPE "simple") set(SYSTEMD_SERVICE_TYPE "simple" CACHE STRING SYSTEMD_SERVICE_TYPE_DOCSTRING)
set(WATCHDOG_SEC "") set(WATCHDOG_SEC "" CACHE STRING WATCHDOG_SEC_DOCSTRING)
endif() endif()
set(SERVICE_USER_DOCSTRING "The value used as the User= in the systemd unit file.")
if(NOT DEFINED SERVICE_USER) if(NOT DEFINED SERVICE_USER)
set(SERVICE_USER "nobody") set(SERVICE_USER "nobody" CACHE STRING SERVICE_USER_DOCSTRING)
endif() endif()
set(SERVICE_GROUP_DOCSTRING "The value used as the Group= in the systemd unit file.")
if(NOT DEFINED SERVICE_GROUP) if(NOT DEFINED SERVICE_GROUP)
set(SERVICE_GROUP "nobody") set(SERVICE_GROUP "nobody" CACHE STRING SERVICE_GROUP_DOCSTRING)
endif() endif()
configure_file(unit/biboumi.service.cmake biboumi.service) configure_file(unit/biboumi.service.cmake biboumi.service)
cmake/Modules/FindLITESQL.cmake
+2 -1
View File
@@ -36,6 +36,7 @@ foreach(DB_TYPE sqlite postgresql mysql ocilib)
if(LITESQL_${DB_TYPE_UPPER}_LIB_PATH) if(LITESQL_${DB_TYPE_UPPER}_LIB_PATH)
list(APPEND LITESQL_LIBRARIES ${LITESQL_${DB_TYPE_UPPER}_LIB_PATH}) list(APPEND LITESQL_LIBRARIES ${LITESQL_${DB_TYPE_UPPER}_LIB_PATH})
endif() endif()
mark_as_advanced(LITESQL_${DB_TYPE_UPPER}_LIB_PATH)
endforeach() endforeach()
find_program(LITESQLGEN_EXECUTABLE NAMES litesql-gen find_program(LITESQLGEN_EXECUTABLE NAMES litesql-gen
@@ -53,7 +54,7 @@ if(LITESQL_FOUND)
set(LITESQL_LIBRARY ${LITESQL_LIBRARIES}) set(LITESQL_LIBRARY ${LITESQL_LIBRARIES})
endif() endif()
mark_as_advanced(LITESQL_INCLUDE_DIRS LITESQL_LIBRARIES) mark_as_advanced(LITESQL_INCLUDE_DIRS LITESQL_LIBRARIES LITESQLGEN_EXECUTABLE)
# LITESQL_GENERATE_CPP function # LITESQL_GENERATE_CPP function