[Cmake-commits] [cmake-commits] king committed UnixPaths.cmake 1.16 1.17 WindowsPaths.cmake 1.7 1.8

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv2841/Modules/Platform

Modified Files:
	UnixPaths.cmake WindowsPaths.cmake 
Log Message:
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.


Index: WindowsPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/WindowsPaths.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** WindowsPaths.cmake	5 Oct 2009 15:47:05 -0000	1.7
--- WindowsPaths.cmake	5 Oct 2009 15:47:25 -0000	1.8
***************
*** 13,16 ****
--- 13,26 ----
  #  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.

Index: UnixPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/UnixPaths.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** UnixPaths.cmake	5 Oct 2009 15:47:03 -0000	1.16
--- UnixPaths.cmake	5 Oct 2009 15:47:24 -0000	1.17
***************
*** 13,16 ****
--- 13,26 ----
  #  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)