kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2009-10-05 11:47:25 -04:00
parent 3dc80f8d8c
commit f98a4e63fd
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/Platform/UnixPaths.cmake
View File

@ -12,6 +12,16 @@
# (To distributed this file outside of CMake, substitute the full # (To distributed this file outside of CMake, substitute the full
# License text for the above reference.) # 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) SET(UNIX 1)
# also add the install directory of the running cmake to the search directories # also add the install directory of the running cmake to the search directories

10
Modules/Platform/WindowsPaths.cmake
View File

@ -12,6 +12,16 @@
# (To distributed this file outside of CMake, substitute the full # (To distributed this file outside of CMake, substitute the full
# License text for the above reference.) # 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 # Add the program-files folder(s) to the list of installation
# prefixes. # prefixes.
# #