speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity Actions 7

cmake: Replace SOURCE_DIR with CMAKE_SOURCE_DIR

Browse source 
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
This commit is contained in:
Xavier Del Campo Romero 2025-01-17 06:26:26 +01:00
parent 1e660bc583
commit ce433d14d2
Signed by: xavi
GPG key ID: 84FF3612A9BF43F2
12 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/checks.cmake
View file

@ -1,7 +1,3 @@
IF(NOT DEFINED SOURCE_DIR)
MESSAGE(ERROR ": Please first include macro's")
ENDIF(NOT DEFINED SOURCE_DIR)
INCLUDE(CheckIncludeFiles) INCLUDE(CheckIncludeFiles)
INCLUDE(CheckFunctionExists) INCLUDE(CheckFunctionExists)
INCLUDE(CheckLibraryExists) INCLUDE(CheckLibraryExists)

4
cmake/doxygenconfig.in.cmake
View file

@ -114,7 +114,7 @@ FULL_PATH_NAMES = YES
# If left blank the directory from which doxygen is run is used as the # If left blank the directory from which doxygen is run is used as the
# path to strip. # 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 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 # 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 # directories like "/usr/src/myproject". Separate the files or directories
# with spaces. # 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 # 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 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

4
cmake/install.cmake
View file

@ -50,8 +50,8 @@ ENDMACRO(_GET_TARGET_REAL_PATHNAME TGT_NAME VAR_PATHNAME)
# Installs bt.so in ${prefix}/${SD_LIBDIR}/drivers/bt # Installs bt.so in ${prefix}/${SD_LIBDIR}/drivers/bt
# SD_INSTALL_FILES(BIN TARGETS speed-dreams) # SD_INSTALL_FILES(BIN TARGETS speed-dreams)
# Installs the speed-dreams target in ${prefix}/${SD_BINDIR} # Installs the speed-dreams target in ${prefix}/${SD_BINDIR}
# SD_INSTALL_FILES(MAN man6 PREFIX ${SOURCE_DIR}/doc/man FILES sd2-menuview.6) # SD_INSTALL_FILES(MAN man6 PREFIX ${CMAKE_SOURCE_DIR}/doc/man FILES sd2-menuview.6)
# Installs ${SOURCE_DIR}/doc/man/sd2-menuview.6 in ${prefix}/${SD_MANDIR}/man6 # Installs ${CMAKE_SOURCE_DIR}/doc/man/sd2-menuview.6 in ${prefix}/${SD_MANDIR}/man6
MACRO(SD_INSTALL_FILES) MACRO(SD_INSTALL_FILES)
SET(SD_INSTALL_FILES_SYNTAX ${SD_INSTALL_FILES_SYNTAX} "LIB,1,1,IS_LIB,LIB_PATH") SET(SD_INSTALL_FILES_SYNTAX ${SD_INSTALL_FILES_SYNTAX} "LIB,1,1,IS_LIB,LIB_PATH")

10
cmake/macros.cmake
View file

@ -36,12 +36,6 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
ENDIF() ENDIF()
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) 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 # The path of the folder of the current CMakeLists.txt
GET_FILENAME_COMPONENT(CURRENT_LIST_FILE_PATH ${CMAKE_CURRENT_LIST_FILE} PATH) GET_FILENAME_COMPONENT(CURRENT_LIST_FILE_PATH ${CMAKE_CURRENT_LIST_FILE} PATH)
@ -279,7 +273,7 @@ MACRO(SD_GENERATE_CLOBBER_SCRIPT)
IF(MSVC) 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(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 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") 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) 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(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}" "# CMake-generated script for in-source build tree total cleanup\n")
FILE(APPEND "${TGT_SCRIPT}" "# (remove any build-system-generated file (+ .bak, *~, ... etc), \n") FILE(APPEND "${TGT_SCRIPT}" "# (remove any build-system-generated file (+ .bak, *~, ... etc), \n")

2
cmake/options.cmake
View file

@ -28,7 +28,7 @@ MACRO(ADD_SD_COMPILE_OPTIONS)
ADD_DEFINITIONS(-DHAVE_CONFIG_H) ADD_DEFINITIONS(-DHAVE_CONFIG_H)
IF(IN_SOURCETREE) IF(IN_SOURCETREE)
SET(INCLUDE_CANDIDATE ${SOURCE_DIR}) SET(INCLUDE_CANDIDATE ${CMAKE_SOURCE_DIR})
ELSE(IN_SOURCETREE) ELSE(IN_SOURCETREE)
SET(INCLUDE_CANDIDATE "") SET(INCLUDE_CANDIDATE "")
ENDIF(IN_SOURCETREE) ENDIF(IN_SOURCETREE)

2
cmake/robot.cmake
View file

@ -65,7 +65,7 @@ MACRO(GENERATE_ROBOT_DEF_FILE ROBOTNAME DEF_FILE)
# Generate the .def file # Generate the .def file
SET(ROBOT_NAME "${ROBOTNAME}") SET(ROBOT_NAME "${ROBOTNAME}")
IF(IN_SOURCETREE) 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) ELSE(IN_SOURCETREE)
CONFIGURE_FILE(${SD_DATADIR}/cmake/robot.def.in.cmake ${DEF_FILE}) CONFIGURE_FILE(${SD_DATADIR}/cmake/robot.def.in.cmake ${DEF_FILE})
ENDIF(IN_SOURCETREE) ENDIF(IN_SOURCETREE)

2
src/main/CMakeLists.txt
View file

@ -45,7 +45,7 @@ IF(MINGW)
ENDIF(MINGW) ENDIF(MINGW)
IF(UNIX) 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) ENDIF(UNIX)
SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME})

2
src/tools/accc/CMakeLists.txt
View file

@ -15,7 +15,7 @@ SD_ADD_EXECUTABLE(${_TARGET_NAME} ${ACCC_SOURCES} ${ACCC_HEADERS})
ADD_SDLIB_LIBRARY(${_TARGET_NAME} portability) ADD_SDLIB_LIBRARY(${_TARGET_NAME} portability)
IF(UNIX) 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) ENDIF(UNIX)
SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME})

2
src/tools/menuview/CMakeLists.txt
View file

@ -47,7 +47,7 @@ IF(MINGW)
ENDIF(MINGW) ENDIF(MINGW)
IF(UNIX) 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) ENDIF(UNIX)
SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME})

2
src/tools/nfs2ac/CMakeLists.txt
View file

@ -13,7 +13,7 @@ SD_ADD_EXECUTABLE(${_TARGET_NAME} ${NFS2AC_SOURCES})
ADD_SDLIB_LIBRARY(${_TARGET_NAME} portability) ADD_SDLIB_LIBRARY(${_TARGET_NAME} portability)
IF(UNIX) 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) ENDIF(UNIX)
SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME})

2
src/tools/nfsperf/CMakeLists.txt
View file

@ -19,7 +19,7 @@ ADD_SDLIB_LIBRARY(${_TARGET_NAME} portability tgf txml) # txml ignored if OPTION
ADD_DL_LIBRARY(${_TARGET_NAME}) ADD_DL_LIBRARY(${_TARGET_NAME})
IF(UNIX) 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) ENDIF(UNIX)
SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME})

2
src/tools/trackgen/CMakeLists.txt
View file

@ -51,7 +51,7 @@ IF(MINGW)
ENDIF(MINGW) ENDIF(MINGW)
IF(UNIX) 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) ENDIF(UNIX)
SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME})