[Cmake-commits] [cmake-commits] hoffman committed CMakeDetermineCompilerABI.cmake 1.1 1.1.2.1 CPack.RuntimeScript.in 1.2 1.2.12.1 CPack.cmake 1.35.2.1 1.35.2.2 FindMPI.cmake 1.15.2.2 1.15.2.3 FindwxWidgets.cmake 1.18 1.18.2.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Sun Apr 20 20:44:53 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv31631/Modules
Modified Files:
Tag: CMake-2-6
CMakeDetermineCompilerABI.cmake CPack.RuntimeScript.in
CPack.cmake FindMPI.cmake FindwxWidgets.cmake
Log Message:
ENH: merge in from main tree
Index: CPack.RuntimeScript.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.RuntimeScript.in,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -C 2 -d -r1.2 -r1.2.12.1
*** CPack.RuntimeScript.in 10 Jan 2007 23:33:03 -0000 1.2
--- CPack.RuntimeScript.in 21 Apr 2008 00:44:51 -0000 1.2.12.1
***************
*** 6,9 ****
--- 6,29 ----
TMP=/tmp/$UID/TemporaryItems
+ version=`sw_vers -productVersion`
+ if [ "$?" == "0" ]; then
+ major=${version%%\.*}
+ rest=${version#*\.}
+ minor=${rest%%\.*}
+ build=${rest#*\.}
+ else
+ major=10
+ minor=4
+ build=0
+ fi
+
+ echo $version
+ echo "Major = $major"
+ echo "Minor = $minor"
+ echo "Build = $build"
+
+
+ # if 10.5 or greater, then all the open-x11 stuff need not occur
+ if ((( $major < 10 )) || ((( $major == 10)) && (( $minor < 5 )))); then
ps -wx -ocommand | grep -e '[X]11.app' > /dev/null
if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
***************
*** 43,45 ****
--- 63,66 ----
shift
fi
+ fi
exec "$CWD/bin/@CPACK_EXECUTABLE_NAME@" "$@" > /tmp/slicer.output 2>&1
Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -C 2 -d -r1.15.2.2 -r1.15.2.3
*** FindMPI.cmake 31 Mar 2008 21:57:41 -0000 1.15.2.2
--- FindMPI.cmake 21 Apr 2008 00:44:51 -0000 1.15.2.3
***************
*** 217,227 ****
)
! # TODO: How do we know whether we're building 32-bit vs. 64-bit for MS-MPI?
find_library(MPI_LIBRARY
! NAMES mpi mpich
PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
"C:/Program Files/MPICH/SDK/Lib"
"$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib"
! "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Lib/i386"
)
find_library(MPI_LIBRARY
--- 217,233 ----
)
! # Decide between 32-bit and 64-bit libraries for Microsoft's MPI
! if (CMAKE_CL_64)
! set(MS_MPI_ARCH_DIR amd64)
! else (CMAKE_CL_64)
! set(MS_MPI_ARCH_DIR i386)
! endif (CMAKE_CL_64)
!
find_library(MPI_LIBRARY
! NAMES mpi mpich msmpi
PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
"C:/Program Files/MPICH/SDK/Lib"
"$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib"
! "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Lib/${MS_MPI_ARCH_DIR}"
)
find_library(MPI_LIBRARY
Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C 2 -d -r1.18 -r1.18.2.1
*** FindwxWidgets.cmake 18 Jan 2008 20:52:53 -0000 1.18
--- FindwxWidgets.cmake 21 Apr 2008 00:44:51 -0000 1.18.2.1
***************
*** 133,136 ****
--- 133,148 ----
SET(wxWidgets_CXX_FLAGS "")
+ # Using SYSTEM with INCLUDE_DIRECTORIES in conjunction with wxWidgets on
+ # the Mac produces compiler errors. Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM
+ # to prevent UsewxWidgets.cmake from using SYSTEM.
+ #
+ # See cmake mailing list discussions for more info:
+ # http://www.cmake.org/pipermail/cmake/2008-April/021115.html
+ # http://www.cmake.org/pipermail/cmake/2008-April/021146.html
+ #
+ IF(APPLE)
+ SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
+ ENDIF(APPLE)
+
# DEPRECATED: This is a patch to support the DEPRECATED use of
# wxWidgets_USE_LIBS.
Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -C 2 -d -r1.35.2.1 -r1.35.2.2
*** CPack.cmake 27 Mar 2008 15:16:30 -0000 1.35.2.1
--- CPack.cmake 21 Apr 2008 00:44:51 -0000 1.35.2.2
***************
*** 112,146 ****
if(UNIX)
if(CYGWIN)
! option(CPACK_CYGWIN_BINARY "Enable to build Cygwin binary packages" ON)
else(CYGWIN)
if(APPLE)
! option(CPACK_PACKAGEMAKER "Enable to build PackageMaker packages" ON)
! option(CPACK_OSXX11 "Enable to build OSX X11 packages" OFF)
else(APPLE)
! option(CPACK_TZ "Enable to build TZ packages" ON)
endif(APPLE)
! option(CPACK_STGZ "Enable to build STGZ packages" ON)
! option(CPACK_TGZ "Enable to build TGZ packages" ON)
! option(CPACK_TBZ2 "Enable to build TBZ2 packages" ON)
! option(CPACK_DEB "Enable to build Debian packages" OFF)
! option(CPACK_RPM "Enable to build RPM packages" OFF)
! option(CPACK_NSIS "Enable to build NSIS packages" OFF)
endif(CYGWIN)
else(UNIX)
! option(CPACK_NSIS "Enable to build NSIS packages" ON)
! option(CPACK_ZIP "Enable to build ZIP packages" ON)
endif(UNIX)
! cpack_optional_append(CPACK_GENERATOR CPACK_PACKAGEMAKER PackageMaker)
! cpack_optional_append(CPACK_GENERATOR CPACK_OSXX11 OSXX11)
! cpack_optional_append(CPACK_GENERATOR CPACK_CYGWIN_BINARY CygwinBinary)
! cpack_optional_append(CPACK_GENERATOR CPACK_DEB DEB)
! cpack_optional_append(CPACK_GENERATOR CPACK_RPM RPM)
! cpack_optional_append(CPACK_GENERATOR CPACK_NSIS NSIS)
! cpack_optional_append(CPACK_GENERATOR CPACK_STGZ STGZ)
! cpack_optional_append(CPACK_GENERATOR CPACK_TGZ TGZ)
! cpack_optional_append(CPACK_GENERATOR CPACK_TBZ2 TBZ2)
! cpack_optional_append(CPACK_GENERATOR CPACK_TZ TZ)
! cpack_optional_append(CPACK_GENERATOR CPACK_ZIP ZIP)
endif(NOT CPACK_GENERATOR)
--- 112,146 ----
if(UNIX)
if(CYGWIN)
! option(CPACK_BINARY_CYGWIN "Enable to build Cygwin binary packages" ON)
else(CYGWIN)
if(APPLE)
! option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" ON)
! option(CPACK_BINARY_OSXX11 "Enable to build OSX X11 packages" OFF)
else(APPLE)
! option(CPACK_BINARY_TZ "Enable to build TZ packages" ON)
endif(APPLE)
! option(CPACK_BINARY_STGZ "Enable to build STGZ packages" ON)
! option(CPACK_BINARY_TGZ "Enable to build TGZ packages" ON)
! option(CPACK_BINARY_TBZ2 "Enable to build TBZ2 packages" ON)
! option(CPACK_BINARY_DEB "Enable to build Debian packages" OFF)
! option(CPACK_BINARY_RPM "Enable to build RPM packages" OFF)
! option(CPACK_BINARY_NSIS "Enable to build NSIS packages" OFF)
endif(CYGWIN)
else(UNIX)
! option(CPACK_BINARY_NSIS "Enable to build NSIS packages" ON)
! option(CPACK_BINARY_ZIP "Enable to build ZIP packages" ON)
endif(UNIX)
! cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PACKAGEMAKER PackageMaker)
! cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_OSXX11 OSXX11)
! cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_CYGWIN CygwinBinary)
! cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_DEB DEB)
! cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_RPM RPM)
! cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_NSIS NSIS)
! cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_STGZ STGZ)
! cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TGZ TGZ)
! cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TBZ2 TBZ2)
! cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TZ TZ)
! cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_ZIP ZIP)
endif(NOT CPACK_GENERATOR)
***************
*** 169,175 ****
# mark the above options as advanced
! mark_as_advanced(CPACK_CYGWIN_BINARY CPACK_PACKAGEMAKER CPACK_OSXX11
! CPACK_STGZ CPACK_TGZ CPACK_TBZ2 CPACK_DEB CPACK_RPM
! CPACK_TZ CPACK_NSIS CPACK_ZIP
CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ
CPACK_SOURCE_TZ CPACK_SOURCE_ZIP)
--- 169,176 ----
# mark the above options as advanced
! mark_as_advanced(CPACK_BINARY_CYGWIN CPACK_BINARY_PACKAGEMAKER CPACK_BINARY_OSXX11
! CPACK_BINARY_STGZ CPACK_BINARY_TGZ CPACK_BINARY_TBZ2
! CPACK_BINARY_DEB CPACK_BINARY_RPM CPACK_BINARY_TZ
! CPACK_BINARY_NSIS CPACK_BINARY_ZIP
CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ
CPACK_SOURCE_TZ CPACK_SOURCE_ZIP)
Index: CMakeDetermineCompilerABI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeDetermineCompilerABI.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** CMakeDetermineCompilerABI.cmake 21 Jan 2008 23:30:17 -0000 1.1
--- CMakeDetermineCompilerABI.cmake 21 Apr 2008 00:44:51 -0000 1.1.2.1
***************
*** 6,10 ****
FUNCTION(CMAKE_DETERMINE_COMPILER_ABI lang src)
IF(NOT DEFINED CMAKE_DETERMINE_${lang}_ABI_COMPILED)
! MESSAGE(STATUS "Detecting ${lang} compiler info")
# Compile the ABI identification source.
--- 6,10 ----
FUNCTION(CMAKE_DETERMINE_COMPILER_ABI lang src)
IF(NOT DEFINED CMAKE_DETERMINE_${lang}_ABI_COMPILED)
! MESSAGE(STATUS "Detecting ${lang} compiler ABI info")
# Compile the ABI identification source.
***************
*** 18,24 ****
# Load the resulting information strings.
IF(CMAKE_DETERMINE_${lang}_ABI_COMPILED)
! MESSAGE(STATUS "Detecting ${lang} compiler info - done")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
! "Detecting ${lang} compiler info compiled with the following output:\n${OUTPUT}\n\n")
FILE(STRINGS "${BIN}" ABI_STRINGS LIMIT_COUNT 2 REGEX "INFO:[^[]*\\[")
FOREACH(info ${ABI_STRINGS})
--- 18,24 ----
# Load the resulting information strings.
IF(CMAKE_DETERMINE_${lang}_ABI_COMPILED)
! MESSAGE(STATUS "Detecting ${lang} compiler ABI info - done")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
! "Detecting ${lang} compiler ABI info compiled with the following output:\n${OUTPUT}\n\n")
FILE(STRINGS "${BIN}" ABI_STRINGS LIMIT_COUNT 2 REGEX "INFO:[^[]*\\[")
FOREACH(info ${ABI_STRINGS})
***************
*** 42,48 ****
ELSE(CMAKE_DETERMINE_${lang}_ABI_COMPILED)
! MESSAGE(STATUS "Detecting ${lang} compiler info - failed")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
! "Detecting ${lang} compiler info failed to compile with the following output:\n${OUTPUT}\n\n")
ENDIF(CMAKE_DETERMINE_${lang}_ABI_COMPILED)
ENDIF(NOT DEFINED CMAKE_DETERMINE_${lang}_ABI_COMPILED)
--- 42,48 ----
ELSE(CMAKE_DETERMINE_${lang}_ABI_COMPILED)
! MESSAGE(STATUS "Detecting ${lang} compiler ABI info - failed")
FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
! "Detecting ${lang} compiler ABI info failed to compile with the following output:\n${OUTPUT}\n\n")
ENDIF(CMAKE_DETERMINE_${lang}_ABI_COMPILED)
ENDIF(NOT DEFINED CMAKE_DETERMINE_${lang}_ABI_COMPILED)
More information about the Cmake-commits
mailing list