From: Bastian Dehn Date: Sat, 30 May 2026 12:35:35 +0000 (+0200) Subject: change optimize cmake files X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=a9d7c3244bc445455a5eadbf8729e1d08cad82c2;p=feierabend.git change optimize cmake files --- diff --git a/CMakeLists.txt b/CMakeLists.txt index cf386d2..64338f7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,13 +1,14 @@ cmake_minimum_required(VERSION 3.16.3) -set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type") +set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "[Debug|Release]") -project(feierabend-c) +project(feierabend VERSION 1.3.23) +message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") if(${CMAKE_BUILD_TYPE} STREQUAL "Release") - set(CMAKE_C_FLAGS "-s -std=c99 -Werror -Wextra -pedantic") + set(CMAKE_C_FLAGS "-std=c99 -s -Werror -Wextra -pedantic") else() - set(CMAKE_C_FLAGS "-std=c99 -Wall -Wextra -pedantic -g -fsanitize=address") + set(CMAKE_C_FLAGS "-std=c99 -g -Wall -Wextra -pedantic -fsanitize=address") endif() message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0752a5a..e547491 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,14 +1,3 @@ -cmake_minimum_required(VERSION 3.16.3) - -project(feierabend VERSION 1.3.23) -message(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}") - -include(GNUInstallDirs) - -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set_property(CACHE CMAKE_INSTALL_PREFIX PROPERTY VALUE "/usr") -endif() - find_package(LibXml2 REQUIRED) message(STATUS "find LibXml2: ${LIBXML2_LIBRARY}") @@ -17,17 +6,12 @@ if(${LIBXML2_VERSION_STRING} VERSION_LESS 2.10) message(STATUS "define LIBXML_BEFORE_2_10") endif() -message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") -message(STATUS "CMAKE_INSTALL_BINDIR: ${CMAKE_INSTALL_BINDIR}") - set(SOLL_HOUR 8 CACHE STRING "soll Stunden") -set(SOLL_MINUTES 0 CACHE STRING "soll Minuten") - message(STATUS "SOLL_HOUR: ${SOLL_HOUR}") +set(SOLL_MINUTES 0 CACHE STRING "soll Minuten") message(STATUS "SOLL_MINUTES: ${SOLL_MINUTES}") configure_file(config.h.in config.h) - include_directories(${CMAKE_CURRENT_BINARY_DIR} ${LIBXML2_INCLUDE_DIR}) add_executable(${PROJECT_NAME} @@ -63,6 +47,11 @@ add_custom_target(manpages ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/feierabend.1.gz ${CMAKE_CURRENT_BINARY_DIR}/feierabendxml.1.gz) +include(GNUInstallDirs) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set_property(CACHE CMAKE_INSTALL_PREFIX PROPERTY VALUE "/usr") +endif() +message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d48068a..3601e44 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,18 +1,13 @@ -cmake_minimum_required(VERSION 3.16.3) - find_library(CMOCKA cmocka REQUIRED) message(STATUS "find cmocka: ${CMOCKA}") find_program(CPPCHECK cppcheck REQUIRED) message(STATUS "find cppcheck: ${CPPCHECK}") - execute_process(COMMAND bash -c "${CPPCHECK} --version | sed -z 's/Cppcheck \\(.*\\)\\n$/\\1/'" OUTPUT_VARIABLE CPPCHECK_VERSION) - message(STATUS "CPPCHECK_VERSION: ${CPPCHECK_VERSION}") include_directories(${CMAKE_BINARY_DIR}/src) - add_executable(tests tests.c break_tests.c @@ -25,7 +20,6 @@ add_executable(tests ../src/break.c) target_link_libraries(tests ${CMOCKA}) - add_custom_target(run_tests ALL ./tests DEPENDS tests)