From edbad1c209bb37b96de1c5e86b431a767a5962f6 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 30 May 2026 14:47:32 +0200 Subject: [PATCH] change optimize cmake files --- CMakeLists.txt | 7 +++++-- src/CMakeLists.txt | 14 +++++--------- tests/CMakeLists.txt | 7 +++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c48dd5c..d371d5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,9 +3,10 @@ cmake_minimum_required(VERSION 3.25.1) set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "build type") project(mv-none-space VERSION 1.1.12) +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 -g -Wall -Wextra -pedantic -fsanitize=address") endif() @@ -14,4 +15,6 @@ message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") message(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}") add_subdirectory(src) -add_subdirectory(tests) \ No newline at end of file +if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") + add_subdirectory(tests) +endif() \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a8f6626..3dd195d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,11 +1,3 @@ -cmake_minimum_required(VERSION 3.25.1) - -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}") - configure_file(config.h.in config.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -24,6 +16,11 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mv-none-space.1.gz > ${CMAKE_CURRENT_BINARY_DIR}/mv-none-space.1.gz) add_custom_target(manpage ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mv-none-space.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 @@ -33,7 +30,6 @@ set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS WORLD_READ WORLD_EXECUTE) -include(GNUInstallDirs) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mv-none-space.1.gz diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f2580f4..2a566bb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,8 +1,8 @@ -cmake_minimum_required(VERSION 3.25.1) - find_library(CMOCKA cmocka REQUIRED) -find_program(CPPCHECK cppcheck 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) @@ -14,7 +14,6 @@ add_executable(tests ../src/rename.c) target_link_libraries(tests ${CMOCKA}) - add_custom_target(run_tests ALL ./tests DEPENDS tests) -- 2.47.3