change cmake status message full string

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72c5c4e65ac73d68ac00a61a2e57c7f165d82813..c8cc4ce309323497cbb01dad855a1cbfe893d827 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.25.1)
 
 SET(CMAKE_C_COMPILER gcc)
+MESSAGE(STATUS "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}")
 
 PROJECT("kds-s2000w-net")
 
@@ -42,14 +43,13 @@ IF (RUN_TESTS)
 CACHE STRING "test coverage compiler flags" FORCE)
 ENDIF()
 
-MESSAGE(STATUS "CMAKE_BUILD_TYPE " ${CMAKE_BUILD_TYPE})
-MESSAGE(STATUS "CMAKE_C_COMPILER " ${CMAKE_C_COMPILER})
-MESSAGE(STATUS "CMAKE_C_FLAGS " ${CMAKE_C_FLAGS})
+MESSAGE(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+MESSAGE(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
 
 ADD_SUBDIRECTORY(src)
 
 OPTION(RUN_TESTS "Enable tests" OFF)
-
+MESSAGE(STATUS "RUN_TESTS: ${RUN_TESTS}")
 IF(RUN_TESTS)
        ADD_SUBDIRECTORY(tests)
 ENDIF()
\ No newline at end of file

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5eb45a8e85815668c61eaa81c1a8122ecfbf9cee..629282b8da461f5a9b86480764a931f53da0d41c 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,9 +5,7 @@ PROJECT("sane-kds-s2000w-net")
 SET(PROJECT_VERSION_MAJOR 1)
 SET(PROJECT_VERSION_MINOR 1)
 SET(PROJECT_VERSION_PATCH 20)
-
 SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
-
 FIND_PACKAGE(Git)
 IF(GIT_FOUND)
        EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} branch --show-current
@@ -22,55 +20,54 @@ IF(GIT_FOUND)
                SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK})
        ENDIF()
 ENDIF()
-
-MESSAGE(STATUS "PROJECT_VERSION " ${PROJECT_VERSION})
+MESSAGE(STATUS "PROJECT_VERSION: ${PROJECT_VERSION}")
 
 OPTION(IMAGEMAGICK "without ImageMagick library" OFF)
-MESSAGE(STATUS "IMAGEMAGICK: " ${IMAGEMAGICK})
+MESSAGE(STATUS "IMAGEMAGICK: ${IMAGEMAGICK}")
 
 FIND_LIBRARY(SANE NAMES sane REQUIRED ONLY_CMAKE_FIND_ROOT_PATH)
-MESSAGE(STATUS "find sane: " ${SANE})
+MESSAGE(STATUS "find sane: ${SANE}")
 FIND_LIBRARY(MATH NAMES m REQUIRED)
-MESSAGE(STATUS "find math: " ${MATH})
+MESSAGE(STATUS "find math: ${MATH}")
 FIND_LIBRARY(PTHREAD NAMES pthread REQUIRED)
-MESSAGE(STATUS "find pthread: " ${PTHREAD})
+MESSAGE(STATUS "find pthread: ${PTHREAD}")
 FIND_LIBRARY(CONFUSE NAMES confuse REQUIRED)
-MESSAGE(STATUS "find confuse: " ${CONFUSE})
+MESSAGE(STATUS "find confuse: ${CONFUSE}")
 FIND_PACKAGE(CURL REQUIRED)
-MESSAGE(STATUS "find curl: " ${CURL_LIBRARY})
+MESSAGE(STATUS "find curl: ${CURL_LIBRARY}")
 FIND_PACKAGE(JSON-C REQUIRED)
-MESSAGE(STATUS "find json-c: " ${JSON\-C_DIR})
+MESSAGE(STATUS "find json-c: ${JSON\-C_DIR}")
 
 IF(IMAGEMAGICK)
        FIND_PACKAGE(ImageMagick COMPONENTS MagickCore REQUIRED)
-       MESSAGE(STATUS "find ImageMagick: " ${ImageMagick_LIBRARIES})
-       MESSAGE(STATUS "ImageMagick_VERSION_STRING: " ${ImageMagick_VERSION_STRING})
+       MESSAGE(STATUS "find ImageMagick: ${ImageMagick_LIBRARIES}")
+       MESSAGE(STATUS "ImageMagick_VERSION_STRING: ${ImageMagick_VERSION_STRING}")
        STRING(SUBSTRING ${ImageMagick_VERSION_STRING} 0 1 IMAGE_MAGICK_MAJOR)
-       MESSAGE(STATUS "define IMAGE_MAGICK_MAJOR: " ${IMAGE_MAGICK_MAJOR})
+       MESSAGE(STATUS "define IMAGE_MAGICK_MAJOR: ${IMAGE_MAGICK_MAJOR}")
        ADD_COMPILE_DEFINITIONS(IMAGE_MAGICK_MAJOR=${IMAGE_MAGICK_MAJOR})
        IF(${IMAGE_MAGICK_MAJOR} EQUAL 7)
                LIST(APPEND ImageMagick_INCLUDE_DIRS "/usr/include/x86_64-linux-gnu/ImageMagick-7")
        ENDIF()
-       MESSAGE(STATUS "ImageMagick_INCLUDE_DIRS: " ${ImageMagick_INCLUDE_DIRS})
+       MESSAGE(STATUS "ImageMagick_INCLUDE_DIRS: ${ImageMagick_INCLUDE_DIRS}")
 ELSE()
        FIND_LIBRARY(netpbm NAMES netpbm REQUIRED)
-       MESSAGE(STATUS "find netpbm: " ${netpbm})
+       MESSAGE(STATUS "find netpbm: ${netpbm}")
        FIND_PACKAGE(JPEG REQUIRED)
-       MESSAGE(STATUS "find jpeg: " ${JPEG_LIBRARIES})
+       MESSAGE(STATUS "find jpeg: ${JPEG_LIBRARIES}")
        FIND_PACKAGE(TIFF REQUIRED)
-       MESSAGE(STATUS "find tiff: " ${TIFF_LIBRARIES})
+       MESSAGE(STATUS "find tiff: ${TIFF_LIBRARIES}")
 ENDIF()
 
 IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
        SET(CMAKE_INSTALL_PREFIX "/" CACHE PATH "install prefix" FORCE)
 ENDIF()
-MESSAGE(STATUS "CMAKE_INSTALL_PREFIX " ${CMAKE_INSTALL_PREFIX})
+MESSAGE(STATUS "CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}")
 SET(CMAKE_LIBRARY_PATH "usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "library path")
-MESSAGE(STATUS "CMAKE_LIBRARY_PATH " ${CMAKE_LIBRARY_PATH})
+MESSAGE(STATUS "CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}")
 SET(CONFIG_INSTALL_PATH "etc/sane.d" CACHE PATH "config path")
-MESSAGE(STATUS "CONFIG_INSTALL_PATH " ${CONFIG_INSTALL_PATH})
+MESSAGE(STATUS "CONFIG_INSTALL_PATH ${CONFIG_INSTALL_PATH}")
 SET(CONFIG_FILE ${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_PATH}/kds_s2000w_net.conf)
-MESSAGE(STATUS "CONFIG_FILE " ${CONFIG_FILE})
+MESSAGE(STATUS "CONFIG_FILE ${CONFIG_FILE}")
 
 CONFIGURE_FILE(config.h.in config.h)
 CONFIGURE_FILE(debian/conffiles.in conffiles)