[cmake-commits] hoffman committed DragonFly.cmake NONE 1.1.2.1
GNU.cmake NONE 1.1.2.1 NetBSD.cmake 1.6 1.6.2.1 UnixPaths.cmake
1.4.2.2 1.4.2.3 Windows-cl.cmake 1.59.2.8 1.59.2.9
Windows.cmake 1.6 1.6.2.1 WindowsPaths.cmake 1.1 1.1.2.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Oct 25 14:03:51 EDT 2007
Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv31217/Modules/Platform
Modified Files:
Tag: CMake-2-4
NetBSD.cmake UnixPaths.cmake Windows-cl.cmake Windows.cmake
WindowsPaths.cmake
Added Files:
Tag: CMake-2-4
DragonFly.cmake GNU.cmake
Log Message:
ENH: merge in stuff from head
Index: Windows.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows.cmake,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- Windows.cmake 18 Feb 2006 20:37:22 -0000 1.6
+++ Windows.cmake 25 Oct 2007 18:03:48 -0000 1.6.2.1
@@ -30,5 +30,4 @@
#SET(CMAKE_END_TEMP_FILE "")
#SET(CMAKE_VERBOSE_MAKEFILE 1)
-
-
+INCLUDE(Platform/WindowsPaths)
Index: UnixPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/UnixPaths.cmake,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- UnixPaths.cmake 28 May 2007 14:07:03 -0000 1.4.2.2
+++ UnixPaths.cmake 25 Oct 2007 18:03:48 -0000 1.4.2.3
@@ -1,3 +1,8 @@
+# also add the install directory of the running cmake to the search directories
+# CMAKE_ROOT is CMAKE_INSTALL_PREFIX/share/cmake, so we need to go two levels up
+GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH)
+GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+
SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH}
# Standard
/include /usr/include /usr/local/include
@@ -10,6 +15,10 @@
# Other
/opt/local/include /usr/pkg/include
+ /opt/csw/include /opt/include
+ /usr/openwin/include
+ "${_CMAKE_INSTALL_DIR}/include"
+ "${CMAKE_INSTALL_PREFIX}/include"
)
SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
@@ -25,10 +34,15 @@
# Other
/opt/local/lib /usr/pkg/lib
/opt/csw/lib /opt/lib
+ /usr/openwin/lib
+ "${_CMAKE_INSTALL_DIR}/lib"
+ "${CMAKE_INSTALL_PREFIX}/lib"
)
SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
/bin /usr/bin /usr/local/bin /usr/pkg/bin /sbin
+ "${_CMAKE_INSTALL_DIR}/bin"
+ "${CMAKE_INSTALL_PREFIX}/bin"
)
SET(CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
Index: NetBSD.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/NetBSD.cmake,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- NetBSD.cmake 27 Mar 2006 15:46:42 -0000 1.6
+++ NetBSD.cmake 25 Oct 2007 18:03:48 -0000 1.6.2.1
@@ -5,5 +5,8 @@
SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") # +s, flag for exe link to use shared lib
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") # -rpath
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
+ SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
+ SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
ENDIF(EXISTS /usr/include/dlfcn.h)
+
INCLUDE(Platform/UnixPaths)
Index: WindowsPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/WindowsPaths.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- WindowsPaths.cmake 2 Mar 2006 18:30:22 -0000 1.1
+++ WindowsPaths.cmake 25 Oct 2007 18:03:48 -0000 1.1.2.1
@@ -1,3 +1,11 @@
-SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} "$ENV{ProgramFiles}")
-SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} "$ENV{ProgramFiles}")
-SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} "$ENV{ProgramFiles}")
+GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH)
+GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
+
+SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH}
+ "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/include" "${_CMAKE_INSTALL_DIR}/include")
+
+SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
+ "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/lib" "${_CMAKE_INSTALL_DIR}/lib")
+
+SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
+ "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/bin" "${_CMAKE_INSTALL_DIR}/bin")
--- NEW FILE: GNU.cmake ---
# GCC is the default compiler on GNU/Hurd.
SET(CMAKE_DL_LIBS "dl")
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
SET(CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG "-Wl,-soname,")
INCLUDE(Platform/UnixPaths)
--- NEW FILE: DragonFly.cmake ---
# DragonFly BSD was forked from FreeBSD and is still very close to it
# http://www.dragonflybsd.org
# see http://archive.netbsd.se/?ml=dfbsd-users&a=2007-07&m=4678361
INCLUDE(Platform/FreeBSD)
Index: Windows-cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-cl.cmake,v
retrieving revision 1.59.2.8
retrieving revision 1.59.2.9
diff -u -d -r1.59.2.8 -r1.59.2.9
--- Windows-cl.cmake 13 Nov 2006 17:59:55 -0000 1.59.2.8
+++ Windows-cl.cmake 25 Oct 2007 18:03:48 -0000 1.59.2.9
@@ -320,4 +320,3 @@
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXPlatform.cmake IMMEDIATE)
ENDIF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake")
-INCLUDE(Platform/WindowsPaths)
More information about the Cmake-commits
mailing list