What changed, and why it matters
This commit is a build-system cleanup. It replaces absolute top-level CMake path variables (CMAKE_SOURCE_DIR, CMAKE_BINARY_DIR) with project-relative ones (PROJECT_SOURCE_DIR, PROJECT_BINARY_DIR, CMAKE_CURRENT_SOURCE_DIR, CMAKE_CURRENT_BINARY_DIR). This makes the Monero project behave better when it is included as a subdirectory inside another CMake project, but it does not change any runtime code, network protocol, wallet logic, or cryptography. There is no security-relevant change visible in the diff.
No security action required. Treat as a normal build-system maintainability improvement.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The patch modifies CMakeLists.txt and several helper CMake modules to use PROJECT_SOURCE_DIR / PROJECT_BINARY_DIR / CMAKE_CURRENT_SOURCE_DIR / CMAKE_CURRENT_BINARY_DIR instead of CMAKE_SOURCE_DIR / CMAKE_BINARY_DIR. This is a standard CMake best-practice change that improves support for add_subdirectory() inclusion and out-of-tree build layouts. No compiled source files, compiler flags, linker checks, or runtime behavior are substantively changed; the same files are still generated and the same tests are still run.
Changed components
CMake build systemcmake/CheckLinkerFlag.cmakecmake/Version.cmaketests/CMakeLists.txttests/functional_tests/CMakeLists.txttests/fuzz/CMakeLists.txttests/libwallet_api_tests/CMakeLists.txtInspect captured patch +17 / −17
### CMakeLists.txt
@@ -237,7 +237,7 @@ function(forbid_undefined_symbols)
string(APPEND CMAKE_MODULE_LINKER_FLAGS ${TMP})
set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} PARENT_SCOPE)
set(CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS} PARENT_SCOPE)
- set(TEST_PROJECT "${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/CMakeTmp/test_project")
+ set(TEST_PROJECT "${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/CMakeTmp/test_project")
foreach(EXPECT IN ITEMS TRUE FALSE)
file(REMOVE_RECURSE "${TEST_PROJECT}")
file(MAKE_DIRECTORY "${TEST_PROJECT}")
@@ -246,9 +246,9 @@ function(forbid_undefined_symbols)
cmake_minimum_required(VERSION 3.10)
project(test)
option(EXPECT_SUCCESS "" ON)
-file(WRITE "${CMAKE_SOURCE_DIR}/incorrect_source.cpp" "void undefined_symbol(); void symbol() { undefined_symbol(); }")
+file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/incorrect_source.cpp" "void undefined_symbol(); void symbol() { undefined_symbol(); }")
if (EXPECT_SUCCESS)
- file(APPEND "${CMAKE_SOURCE_DIR}/incorrect_source.cpp" " void undefined_symbol() {}; ")
+ file(APPEND "${CMAKE_CURRENT_SOURCE_DIR}/incorrect_source.cpp" " void undefined_symbol() {}; ")
endif()
add_library(l0 SHARED incorrect_source.cpp)
add_library(l1 MODULE incorrect_source.cpp)
@@ -415,7 +415,7 @@ if(PER_BLOCK_CHECKPOINT)
endif()
list(INSERT CMAKE_MODULE_PATH 0
- "${CMAKE_SOURCE_DIR}/cmake")
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
option(BOOST_IGNORE_SYSTEM_PATHS "Ignore boost system paths for local boost installation" OFF)
if (BOOST_IGNORE_SYSTEM_PATHS)
### cmake/CheckLinkerFlag.cmake
@@ -11,7 +11,7 @@ macro(CHECK_LINKER_FLAG flag VARIABLE)
set(saved_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
set(CMAKE_C_FLAGS "${flag}")
try_compile(${VARIABLE}
- ${CMAKE_BINARY_DIR}
+ ${PROJECT_BINARY_DIR}
${_cle_source}
COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${flag}
CMAKE_FLAGS
@@ -30,7 +30,7 @@ macro(CHECK_LINKER_FLAG flag VARIABLE)
message(STATUS "Looking for ${flag} linker flag - found")
endif()
set(${VARIABLE} 1 CACHE INTERNAL "Have linker flag ${flag}")
- file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+ file(APPEND ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
"Determining if the ${flag} linker flag is supported "
"passed with the following output:\n"
"${OUTPUT}\n\n")
@@ -39,7 +39,7 @@ macro(CHECK_LINKER_FLAG flag VARIABLE)
message(STATUS "Looking for ${flag} linker flag - not found")
endif()
set(${VARIABLE} "" CACHE INTERNAL "Have linker flag ${flag}")
- file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+ file(APPEND ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
"Determining if the ${flag} linker flag is supported "
"failed with the following output:\n"
"${OUTPUT}\n\n")
### cmake/Version.cmake
@@ -28,7 +28,7 @@
function (write_version tag)
set(VERSIONTAG "${tag}" CACHE STRING "The tag portion of the Monero software version" FORCE)
- configure_file("${CMAKE_CURRENT_LIST_DIR}/../src/version.cpp.in" "${CMAKE_BINARY_DIR}/version.cpp")
+ configure_file("${CMAKE_CURRENT_LIST_DIR}/../src/version.cpp.in" "${PROJECT_BINARY_DIR}/version.cpp")
endfunction ()
find_package(Git QUIET)
@@ -47,4 +47,4 @@ else()
write_version("unknown")
endif ()
add_custom_target(genversion ALL
- DEPENDS "${CMAKE_BINARY_DIR}/version.cpp")
+ DEPENDS "${PROJECT_BINARY_DIR}/version.cpp")
### src/CMakeLists.txt
@@ -84,7 +84,7 @@ function (monero_add_executable name)
endfunction ()
include(Version)
-monero_add_library(version SOURCES ${CMAKE_BINARY_DIR}/version.cpp DEPENDS genversion)
+monero_add_library(version SOURCES ${PROJECT_BINARY_DIR}/version.cpp DEPENDS genversion)
add_subdirectory(common)
add_subdirectory(crypto)
### tests/CMakeLists.txt
@@ -40,8 +40,8 @@ endif ()
set(BUILD_GMOCK OFF CACHE BOOL "Don't build GMock" FORCE)
set(INSTALL_GTEST OFF CACHE BOOL "Don't install GTest" FORCE)
-add_subdirectory("${CMAKE_SOURCE_DIR}/external/gtest" ${CMAKE_BINARY_DIR}/googletest)
-include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/external/gtest/googletest/include")
+add_subdirectory("${PROJECT_SOURCE_DIR}/external/gtest" ${CMAKE_CURRENT_BINARY_DIR}/googletest)
+include_directories(SYSTEM "${PROJECT_SOURCE_DIR}/external/gtest/googletest/include")
set(GTEST_LIBRARIES gtest gtest_main)
message(STATUS "Copying test data directory...")
### tests/functional_tests/CMakeLists.txt
@@ -56,10 +56,10 @@ execute_process(COMMAND ${Python3_EXECUTABLE} "-c" "import requests; import zmq;
if (REQUESTS_OUTPUT STREQUAL "OK")
add_test(
NAME functional_tests_rpc
- COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/functional_tests_rpc.py" "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" all)
+ COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/functional_tests_rpc.py" "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}" all)
add_test(
NAME check_missing_rpc_methods
- COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/check_missing_rpc_methods.py" "${CMAKE_SOURCE_DIR}")
+ COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/check_missing_rpc_methods.py" "${PROJECT_SOURCE_DIR}")
else()
message(WARNING "functional_tests_rpc and check_missing_rpc_methods skipped, needs the 'requests', 'zmq', and 'deepdiff' python modules")
set(CTEST_CUSTOM_TESTS_IGNORE ${CTEST_CUSTOM_TESTS_IGNORE} functional_tests_rpc check_missing_rpc_methods)
### tests/fuzz/CMakeLists.txt
@@ -30,11 +30,11 @@ add_subdirectory(gen_corpus)
if(OSSFUZZ)
# Add the include path for <fuzzer/FuzzedDataProvider.h>
-include_directories(${CMAKE_SOURCE_DIR}/tests/fuzz/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
# Recompile perf_timer for fuzzing
add_library(fuzz_unsafe_macro OBJECT
- ${CMAKE_SOURCE_DIR}/src/common/perf_timer.cpp)
+ ${PROJECT_SOURCE_DIR}/src/common/perf_timer.cpp)
target_compile_definitions(fuzz_unsafe_macro
PRIVATE FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION)
### tests/libwallet_api_tests/CMakeLists.txt
@@ -69,6 +69,6 @@ set_property(TARGET libwallet_api_tests
add_test(
NAME libwallet_api_tests
- COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/libwallet_api_tests.py" "${CMAKE_BINARY_DIR}" "$<TARGET_FILE:daemon>" "$<TARGET_FILE:libwallet_api_tests>")
+ COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/libwallet_api_tests.py" "${PROJECT_BINARY_DIR}" "$<TARGET_FILE:daemon>" "$<TARGET_FILE:libwallet_api_tests>")
set_tests_properties(libwallet_api_tests PROPERTIES TIMEOUT 240)Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.