[cmake-commits] alex committed Darwin.cmake 1.29 1.29.4.1 Linux.cmake 1.13 1.13.4.1 Windows-cl.cmake 1.78.4.3 1.78.4.4 cl.cmake 1.1.2.1 1.1.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-CrossCompileBasic
	Darwin.cmake Linux.cmake Windows-cl.cmake cl.cmake 
Log Message:

ENH: merge changes from HEAD into the branch
-change INCLUDE(file [OPTIONAL] [VAR]) to INCLUDE(file [OPTIONAL] [RESULT_VARIABLE VAR])
-add tests for INCLUDE(), CMAKE_TOOLCHAIN_FILE and FIND_XXX()
-keep the stripping in CPack for now
-support a MS toolchain suffix

Alex


Index: Linux.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux.cmake,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -d -r1.13 -r1.13.4.1
--- Linux.cmake	18 Apr 2007 03:40:51 -0000	1.13
+++ Linux.cmake	17 May 2007 14:24:35 -0000	1.13.4.1
@@ -34,27 +34,17 @@
   SET(CMAKE_INSTALL_SO_NO_EXE "${CMAKE_INSTALL_SO_NO_EXE}" CACHE INTERNAL
     "Install .so files without execute permission.")
 ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE)
-  # Detect the linux distribution.
-  SET(CMAKE_LINUX_DISTRO)
-  IF(EXISTS "/proc/version")
-    FILE(READ "/proc/version" CMAKE_LINUX_DISTRO)
-  ENDIF(EXISTS "/proc/version")
-
-  # List the distributions that require shared libraries to not have
-  # execute permission.
-  SET(CMAKE_INSTALL_SO_NO_EXE_DISTRO "(Debian|Ubuntu)")
-
   # Store the decision variable as an internal cache entry to avoid
   # checking the platform every time.  This option is advanced enough
   # that only package maintainers should need to adjust it.  They are
   # capable of providing a setting on the command line.
-  IF("${CMAKE_LINUX_DISTRO}" MATCHES "${CMAKE_INSTALL_SO_NO_EXE_DISTRO}")
+  IF(EXISTS "/etc/debian_version")
     SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
       "Install .so files without execute permission.")
-  ELSE("${CMAKE_LINUX_DISTRO}" MATCHES "${CMAKE_INSTALL_SO_NO_EXE_DISTRO}")
+  ELSE(EXISTS "/etc/debian_version")
     SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
       "Install .so files without execute permission.")
-  ENDIF("${CMAKE_LINUX_DISTRO}" MATCHES "${CMAKE_INSTALL_SO_NO_EXE_DISTRO}")
+  ENDIF(EXISTS "/etc/debian_version")
 ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
 
 INCLUDE(Platform/UnixPaths)

Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.29
retrieving revision 1.29.4.1
diff -u -d -r1.29 -r1.29.4.1
--- Darwin.cmake	17 Apr 2007 20:19:36 -0000	1.29
+++ Darwin.cmake	17 May 2007 14:24:35 -0000	1.29.4.1
@@ -76,6 +76,11 @@
 SET(CMAKE_Fortran_CREATE_SHARED_MODULE
       "<CMAKE_Fortran_COMPILER>  <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
 
+SET(CMAKE_C_CREATE_MACOSX_FRAMEWORK
+      "<CMAKE_C_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <LINK_FLAGS> -o <TARGET> -install_name <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
+SET(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK
+      "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> -install_name <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
+
 
  
 SET(CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES /usr/local/include)

Index: Windows-cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-cl.cmake,v
retrieving revision 1.78.4.3
retrieving revision 1.78.4.4
diff -u -d -r1.78.4.3 -r1.78.4.4
--- Windows-cl.cmake	15 May 2007 20:55:50 -0000	1.78.4.3
+++ Windows-cl.cmake	17 May 2007 14:24:35 -0000	1.78.4.4
@@ -3,10 +3,7 @@
 # try to load any previously computed information for CXX on this platform
 INCLUDE( ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake OPTIONAL)
 
-SET(CMAKE_LIBRARY_PATH_FLAG "-LIBPATH:")
-SET(CMAKE_LINK_LIBRARY_FLAG "")
 SET(WIN32 1)
-SET(MSVC 1)
 
 INCLUDE(Platform/cl)
 

Index: cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Attic/cl.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- cl.cmake	15 May 2007 20:53:10 -0000	1.1.2.1
+++ cl.cmake	17 May 2007 14:24:36 -0000	1.1.2.2
@@ -1,3 +1,7 @@
+SET(CMAKE_LIBRARY_PATH_FLAG "-LIBPATH:")
+SET(CMAKE_LINK_LIBRARY_FLAG "")
+SET(MSVC 1)
+
 IF(CMAKE_VERBOSE_MAKEFILE)
   SET(CMAKE_CL_NOLOGO)
 ELSE(CMAKE_VERBOSE_MAKEFILE)