Skip to content

Commit 108410d

Browse files
committed
build: Do not record ROOT_.*_LIBRARY in RConfigOptions.h
1 parent b23626b commit 108410d

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,8 +578,9 @@ foreach(var ${variables})
578578
endif()
579579
else()
580580
if ((NOT var MATCHES "_(DOCS|TESTS|INSTALL)") AND (NOT var MATCHES "^_")
581-
AND NOT(var MATCHES "^CMAKE_PROJECT_VERSION")
582-
AND NOT(var MATCHES "^CMAKE_CACHE_"))
581+
AND NOT(var MATCHES "^CMAKE_PROJECT_VERSION") # Created by the 'latest' call to project()
582+
AND NOT(var MATCHES "^CMAKE_CACHE_") # related to previous CMake invocation eg CMAKE_CACHE_MAJOR_VERSION
583+
AND NOT(var MATCHES "^ROOT_.*_LIBRARY$")) # Created for users in ROOTConfig.cmake
583584
set(ROOT_CONFIGARGS "${ROOT_CONFIGARGS}${var}=${${var}} ")
584585
endif()
585586
endif()

0 commit comments

Comments
 (0)