[Cmake-commits] [cmake-commits] hoffman committed Darwin-icc.cmake 1.1.2.2 1.1.2.3 Darwin.cmake 1.45.2.5 1.45.2.6 UnixPaths.cmake 1.13 1.13.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	Darwin-icc.cmake Darwin.cmake UnixPaths.cmake 
Log Message:
ENH: check in changes to branch, most importantly the header file do not compile fix


Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.45.2.5
retrieving revision 1.45.2.6
diff -C 2 -d -r1.45.2.5 -r1.45.2.6
*** Darwin.cmake	4 Feb 2009 22:04:49 -0000	1.45.2.5
--- Darwin.cmake	23 Mar 2009 17:58:40 -0000	1.45.2.6
***************
*** 141,145 ****
  
   
- SET(CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES /usr/local/include)
  # default to searching for frameworks first
  SET(CMAKE_FIND_FRAMEWORK FIRST)
--- 141,144 ----

Index: Darwin-icc.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin-icc.cmake,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C 2 -d -r1.1.2.2 -r1.1.2.3
*** Darwin-icc.cmake	9 Apr 2008 12:41:46 -0000	1.1.2.2
--- Darwin-icc.cmake	23 Mar 2009 17:58:40 -0000	1.1.2.3
***************
*** 104,108 ****
  # We also need to consider to use cce (which is the 64bit compiler) and not JUST the 32bit compiler.
  # I have no idea what the best way to do that would be.
- SET(CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES /usr/local/include )
  
  
--- 104,107 ----

Index: UnixPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/UnixPaths.cmake,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C 2 -d -r1.13 -r1.13.2.1
*** UnixPaths.cmake	17 Jan 2008 20:54:49 -0000	1.13
--- UnixPaths.cmake	23 Mar 2009 17:58:40 -0000	1.13.2.1
***************
*** 54,57 ****
--- 54,64 ----
    )
  
+ LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+   /usr/include
+   )
+ LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
+   /usr/include
+   )
+ 
  # Enable use of lib64 search path variants by default.
  SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)