From f98a4e63fd645411be939db05fb5857c395b3507 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 5 Oct 2009 11:47:25 -0400 Subject: Avoid (Unix|Windows)Paths.cmake multiple include Block multiple inclusion because "Modules/CMakeCInformation.cmake" includes "Platform/${CMAKE_SYSTEM_NAME}" even though the generic module "CMakeSystemSpecificInformation.cmake" already included it. The extra inclusion is a work-around to address issue #4772 without intrusive platform file changes. Once those changes are made the work-around and these include blockers can be removed. See issue #9656. --- Modules/Platform/UnixPaths.cmake | 10 ++++++++++ Modules/Platform/WindowsPaths.cmake | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake index 7cc5181..ea64b78 100644 --- a/Modules/Platform/UnixPaths.cmake +++ b/Modules/Platform/UnixPaths.cmake @@ -12,6 +12,16 @@ # (To distributed this file outside of CMake, substitute the full # License text for the above reference.) +# Block multiple inclusion because "CMakeCInformation.cmake" includes +# "Platform/${CMAKE_SYSTEM_NAME}" even though the generic module +# "CMakeSystemSpecificInformation.cmake" already included it. +# The extra inclusion is a work-around documented next to the include() +# call, so this can be removed when the work-around is removed. +IF(__UNIX_PATHS_INCLUDED) + RETURN() +ENDIF() +SET(__UNIX_PATHS_INCLUDED 1) + SET(UNIX 1) # also add the install directory of the running cmake to the search directories diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake index 009f56b..8c67175 100644 --- a/Modules/Platform/WindowsPaths.cmake +++ b/Modules/Platform/WindowsPaths.cmake @@ -12,6 +12,16 @@ # (To distributed this file outside of CMake, substitute the full # License text for the above reference.) +# Block multiple inclusion because "CMakeCInformation.cmake" includes +# "Platform/${CMAKE_SYSTEM_NAME}" even though the generic module +# "CMakeSystemSpecificInformation.cmake" already included it. +# The extra inclusion is a work-around documented next to the include() +# call, so this can be removed when the work-around is removed. +IF(__WINDOWS_PATHS_INCLUDED) + RETURN() +ENDIF() +SET(__WINDOWS_PATHS_INCLUDED 1) + # Add the program-files folder(s) to the list of installation # prefixes. # -- cgit v0.12