From ce433d14d2935b8bbfc3d14a1720b3ed607e4787 Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Fri, 17 Jan 2025 06:26:26 +0100 Subject: [PATCH] cmake: Replace SOURCE_DIR with CMAKE_SOURCE_DIR CMAKE_SOURCE_DIR already points to the directory for the top-level CMakelists.txt [1], so SOURCE_DIR is redundant. [1]: https://cmake.org/cmake/help/latest/variable/CMAKE_SOURCE_DIR.html --- cmake/checks.cmake | 4 ---- cmake/doxygenconfig.in.cmake | 4 ++-- cmake/install.cmake | 4 ++-- cmake/macros.cmake | 10 ++-------- cmake/options.cmake | 2 +- cmake/robot.cmake | 2 +- src/main/CMakeLists.txt | 2 +- src/tools/accc/CMakeLists.txt | 2 +- src/tools/menuview/CMakeLists.txt | 2 +- src/tools/nfs2ac/CMakeLists.txt | 2 +- src/tools/nfsperf/CMakeLists.txt | 2 +- src/tools/trackgen/CMakeLists.txt | 2 +- 12 files changed, 14 insertions(+), 24 deletions(-) diff --git a/cmake/checks.cmake b/cmake/checks.cmake index f5cabaa82..c4332de14 100644 --- a/cmake/checks.cmake +++ b/cmake/checks.cmake @@ -1,7 +1,3 @@ -IF(NOT DEFINED SOURCE_DIR) - MESSAGE(ERROR ": Please first include macro's") -ENDIF(NOT DEFINED SOURCE_DIR) - INCLUDE(CheckIncludeFiles) INCLUDE(CheckFunctionExists) INCLUDE(CheckLibraryExists) diff --git a/cmake/doxygenconfig.in.cmake b/cmake/doxygenconfig.in.cmake index d5da3a64c..f63bbf973 100755 --- a/cmake/doxygenconfig.in.cmake +++ b/cmake/doxygenconfig.in.cmake @@ -114,7 +114,7 @@ FULL_PATH_NAMES = YES # If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = @SOURCE_DIR@ +STRIP_FROM_PATH = @CMAKE_SOURCE_DIR@ # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of # the path mentioned in the documentation of a class, which tells @@ -564,7 +564,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = @SOURCE_DIR@/src +INPUT = @CMAKE_SOURCE_DIR@/src # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/cmake/install.cmake b/cmake/install.cmake index 11846b856..d4bf5c11c 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -50,8 +50,8 @@ ENDMACRO(_GET_TARGET_REAL_PATHNAME TGT_NAME VAR_PATHNAME) # Installs bt.so in ${prefix}/${SD_LIBDIR}/drivers/bt # SD_INSTALL_FILES(BIN TARGETS speed-dreams) # Installs the speed-dreams target in ${prefix}/${SD_BINDIR} -# SD_INSTALL_FILES(MAN man6 PREFIX ${SOURCE_DIR}/doc/man FILES sd2-menuview.6) -# Installs ${SOURCE_DIR}/doc/man/sd2-menuview.6 in ${prefix}/${SD_MANDIR}/man6 +# SD_INSTALL_FILES(MAN man6 PREFIX ${CMAKE_SOURCE_DIR}/doc/man FILES sd2-menuview.6) +# Installs ${CMAKE_SOURCE_DIR}/doc/man/sd2-menuview.6 in ${prefix}/${SD_MANDIR}/man6 MACRO(SD_INSTALL_FILES) SET(SD_INSTALL_FILES_SYNTAX ${SD_INSTALL_FILES_SYNTAX} "LIB,1,1,IS_LIB,LIB_PATH") diff --git a/cmake/macros.cmake b/cmake/macros.cmake index 2b43bc265..c7f391b72 100644 --- a/cmake/macros.cmake +++ b/cmake/macros.cmake @@ -36,12 +36,6 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) ENDIF() ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -# Determine the source folder if ??? -IF(NOT SOURCE_DIR AND IN_SOURCETREE) - SET(SOURCE_DIR ${CMAKE_SOURCE_DIR}) - MARK_AS_ADVANCED(SOURCE_DIR) -ENDIF(NOT SOURCE_DIR AND IN_SOURCETREE) - # The path of the folder of the current CMakeLists.txt GET_FILENAME_COMPONENT(CURRENT_LIST_FILE_PATH ${CMAKE_CURRENT_LIST_FILE} PATH) @@ -279,7 +273,7 @@ MACRO(SD_GENERATE_CLOBBER_SCRIPT) IF(MSVC) - SET(TGT_SCRIPT "${SOURCE_DIR}/clobber.bat") + SET(TGT_SCRIPT "${CMAKE_SOURCE_DIR}/clobber.bat") FILE(WRITE "${TGT_SCRIPT}" "@echo off\n") FILE(APPEND "${TGT_SCRIPT}" "rem CMake-generated script for in-source build tree total cleanup\n") FILE(APPEND "${TGT_SCRIPT}" "rem (remove any build-system-generated file (+ .bak, *~, ... etc), \n") @@ -337,7 +331,7 @@ MACRO(SD_GENERATE_CLOBBER_SCRIPT) ELSE(MSVC) - SET(TGT_SCRIPT "${SOURCE_DIR}/clobber.sh") + SET(TGT_SCRIPT "${CMAKE_SOURCE_DIR}/clobber.sh") FILE(WRITE "${TGT_SCRIPT}" "#!/bin/sh\n") FILE(APPEND "${TGT_SCRIPT}" "# CMake-generated script for in-source build tree total cleanup\n") FILE(APPEND "${TGT_SCRIPT}" "# (remove any build-system-generated file (+ .bak, *~, ... etc), \n") diff --git a/cmake/options.cmake b/cmake/options.cmake index 552db8e1c..678995129 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -28,7 +28,7 @@ MACRO(ADD_SD_COMPILE_OPTIONS) ADD_DEFINITIONS(-DHAVE_CONFIG_H) IF(IN_SOURCETREE) - SET(INCLUDE_CANDIDATE ${SOURCE_DIR}) + SET(INCLUDE_CANDIDATE ${CMAKE_SOURCE_DIR}) ELSE(IN_SOURCETREE) SET(INCLUDE_CANDIDATE "") ENDIF(IN_SOURCETREE) diff --git a/cmake/robot.cmake b/cmake/robot.cmake index 1ba436a4c..74b62f955 100644 --- a/cmake/robot.cmake +++ b/cmake/robot.cmake @@ -65,7 +65,7 @@ MACRO(GENERATE_ROBOT_DEF_FILE ROBOTNAME DEF_FILE) # Generate the .def file SET(ROBOT_NAME "${ROBOTNAME}") IF(IN_SOURCETREE) - CONFIGURE_FILE(${SOURCE_DIR}/cmake/robot.def.in.cmake ${DEF_FILE}) + CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/robot.def.in.cmake ${DEF_FILE}) ELSE(IN_SOURCETREE) CONFIGURE_FILE(${SD_DATADIR}/cmake/robot.def.in.cmake ${DEF_FILE}) ENDIF(IN_SOURCETREE) diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index 66710497c..e6de45657 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -45,7 +45,7 @@ IF(MINGW) ENDIF(MINGW) IF(UNIX) - SD_INSTALL_FILES(MAN man6 PREFIX ${SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) + SD_INSTALL_FILES(MAN man6 PREFIX ${CMAKE_SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) ENDIF(UNIX) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) diff --git a/src/tools/accc/CMakeLists.txt b/src/tools/accc/CMakeLists.txt index 81aeb1639..68f7b1a15 100644 --- a/src/tools/accc/CMakeLists.txt +++ b/src/tools/accc/CMakeLists.txt @@ -15,7 +15,7 @@ SD_ADD_EXECUTABLE(${_TARGET_NAME} ${ACCC_SOURCES} ${ACCC_HEADERS}) ADD_SDLIB_LIBRARY(${_TARGET_NAME} portability) IF(UNIX) - SD_INSTALL_FILES(MAN man6 PREFIX ${SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) + SD_INSTALL_FILES(MAN man6 PREFIX ${CMAKE_SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) ENDIF(UNIX) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) diff --git a/src/tools/menuview/CMakeLists.txt b/src/tools/menuview/CMakeLists.txt index 8568e9d55..6ae8e41a9 100644 --- a/src/tools/menuview/CMakeLists.txt +++ b/src/tools/menuview/CMakeLists.txt @@ -47,7 +47,7 @@ IF(MINGW) ENDIF(MINGW) IF(UNIX) - SD_INSTALL_FILES(MAN man6 PREFIX ${SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) + SD_INSTALL_FILES(MAN man6 PREFIX ${CMAKE_SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) ENDIF(UNIX) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) diff --git a/src/tools/nfs2ac/CMakeLists.txt b/src/tools/nfs2ac/CMakeLists.txt index 3fd5b7fa3..a0401b56f 100644 --- a/src/tools/nfs2ac/CMakeLists.txt +++ b/src/tools/nfs2ac/CMakeLists.txt @@ -13,7 +13,7 @@ SD_ADD_EXECUTABLE(${_TARGET_NAME} ${NFS2AC_SOURCES}) ADD_SDLIB_LIBRARY(${_TARGET_NAME} portability) IF(UNIX) - SD_INSTALL_FILES(MAN man6 PREFIX ${SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) + SD_INSTALL_FILES(MAN man6 PREFIX ${CMAKE_SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) ENDIF(UNIX) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) diff --git a/src/tools/nfsperf/CMakeLists.txt b/src/tools/nfsperf/CMakeLists.txt index bab1be5b5..150931663 100644 --- a/src/tools/nfsperf/CMakeLists.txt +++ b/src/tools/nfsperf/CMakeLists.txt @@ -19,7 +19,7 @@ ADD_SDLIB_LIBRARY(${_TARGET_NAME} portability tgf txml) # txml ignored if OPTION ADD_DL_LIBRARY(${_TARGET_NAME}) IF(UNIX) - SD_INSTALL_FILES(MAN man6 PREFIX ${SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) + SD_INSTALL_FILES(MAN man6 PREFIX ${CMAKE_SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) ENDIF(UNIX) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) diff --git a/src/tools/trackgen/CMakeLists.txt b/src/tools/trackgen/CMakeLists.txt index bba7bb7e4..534e9d74c 100644 --- a/src/tools/trackgen/CMakeLists.txt +++ b/src/tools/trackgen/CMakeLists.txt @@ -51,7 +51,7 @@ IF(MINGW) ENDIF(MINGW) IF(UNIX) - SD_INSTALL_FILES(MAN man6 PREFIX ${SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) + SD_INSTALL_FILES(MAN man6 PREFIX ${CMAKE_SOURCE_DIR}/doc/man FILES ${_TARGET_NAME}.6) ENDIF(UNIX) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME})