[Cmake-commits] [cmake-commits] hoffman committed CMakeFortranCompilerId.F.in 1.4 1.4.2.1 CMakeVS10FindMake.cmake 1.2.2.1 1.2.2.2 CMakeVerifyManifest.cmake NONE 1.6.2.2 DartConfiguration.tcl.in 1.11 1.11.2.1 FeatureSummary.cmake 1.4.2.1 1.4.2.2 FindBoost.cmake 1.45.2.2 1.45.2.3 FindCUDA.cmake 1.2.2.2 1.2.2.3 FindJNI.cmake 1.41.2.1 1.41.2.2 FindMPI.cmake 1.23.2.1 1.23.2.2 FindOpenSceneGraph.cmake 1.4.2.1 1.4.2.2 FindPythonLibs.cmake 1.43.2.1 1.43.2.2 FindSquish.cmake 1.1.4.1 1.1.4.2 NSIS.template.in 1.38.2.1 1.38.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Oct 28 12:14:58 EDT 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv18987/Modules
Modified Files:
Tag: CMake-2-8
CMakeFortranCompilerId.F.in CMakeVS10FindMake.cmake
DartConfiguration.tcl.in FeatureSummary.cmake FindBoost.cmake
FindCUDA.cmake FindJNI.cmake FindMPI.cmake
FindOpenSceneGraph.cmake FindPythonLibs.cmake FindSquish.cmake
NSIS.template.in
Added Files:
Tag: CMake-2-8
CMakeVerifyManifest.cmake
Log Message:
RC 4 merge
Index: FindPythonLibs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPythonLibs.cmake,v
retrieving revision 1.43.2.1
retrieving revision 1.43.2.2
diff -C 2 -d -r1.43.2.1 -r1.43.2.2
*** FindPythonLibs.cmake 1 Oct 2009 21:20:32 -0000 1.43.2.1
--- FindPythonLibs.cmake 28 Oct 2009 16:14:56 -0000 1.43.2.2
***************
*** 42,47 ****
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs
- PATH_SUFFIXES
- python${_CURRENT_VERSION}/config
# Avoid finding the .dll in the PATH. We want the .lib.
NO_SYSTEM_ENVIRONMENT_PATH
--- 42,45 ----
Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C 2 -d -r1.23.2.1 -r1.23.2.2
*** FindMPI.cmake 1 Oct 2009 21:20:32 -0000 1.23.2.1
--- FindMPI.cmake 28 Oct 2009 16:14:56 -0000 1.23.2.2
***************
*** 1,4 ****
# - Message Passing Interface (MPI) module.
! #
# The Message Passing Interface (MPI) is a library used to write
# high-performance parallel applications that use message passing, and
--- 1,4 ----
# - Message Passing Interface (MPI) module.
! #
# The Message Passing Interface (MPI) is a library used to write
# high-performance parallel applications that use message passing, and
***************
*** 36,40 ****
# If no compiler driver is found or the compiler driver is not
# recognized, this module will then search for common include paths
! # and library names to try to detect MPI.
#
# If CMake initially finds a different MPI than was intended, and you
--- 36,40 ----
# If no compiler driver is found or the compiler driver is not
# recognized, this module will then search for common include paths
! # and library names to try to detect MPI.
#
# If CMake initially finds a different MPI than was intended, and you
***************
*** 50,54 ****
# ${MPIEXEC_POSTFLAGS} ARGS
# where PROCS is the number of processors on which to execute the program,
! # EXECUTABLE is the MPI program, and ARGS are the arguments to pass to the
# MPI program.
--- 50,54 ----
# ${MPIEXEC_POSTFLAGS} ARGS
# where PROCS is the number of processors on which to execute the program,
! # EXECUTABLE is the MPI program, and ARGS are the arguments to pass to the
# MPI program.
***************
*** 66,84 ****
# License text for the above reference.)
! # Try to find the MPI driver program
! find_program(MPI_COMPILER
! NAMES mpic++ mpicxx mpiCC mpicc
! DOC "MPI compiler. Used only to detect MPI compilation flags.")
! mark_as_advanced(MPI_COMPILER)
! file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles)
find_program(MPIEXEC
NAMES mpiexec mpirun lamexec
! PATHS /usr/bin /usr/local/bin /usr/local/mpi/bin
! "$ENV{SystemDrive}/Program Files/MPICH/SDK/Bin"
! "${ProgramFiles}/MPICH2/Bin"
! "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Bin"
! "$ENV{SystemDrive}/Program Files/Microsoft HPC Pack 2008 SDK/Bin"
! DOC "Executable for running MPI programs.")
set(MPIEXEC_NUMPROC_FLAG "-np" CACHE STRING "Flag used by MPI to specify the number of processes for MPIEXEC; the next option will be the number of processes.")
--- 66,121 ----
# License text for the above reference.)
! # This module is maintained by David Partyka <dave.partyka at kitware.com>.
! # A set of directories to search through in addition to the standard system paths
! # that find_program will search through.
! # Microsoft HPC SDK is automatically added to the system path
! # Argonne National Labs MPICH2 sets a registry key that we can use.
!
! set(MPI_PACKAGE_DIR
! mpi
! mpich
! openmpi
! lib/mpi
! lib/mpich
! lib/openmpi
! "MPICH/SDK"
! "Microsoft Compute Cluster Pack"
! )
!
! set(MPI_PREFIX_PATH)
! if(WIN32)
! list(APPEND MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..")
! endif()
!
! foreach(SystemPrefixDir ${CMAKE_SYSTEM_PREFIX_PATH})
! foreach(MpiPackageDir ${MPI_PREFIX_PATH})
! if(EXISTS ${SystemPrefixDir}/${MpiPackageDir})
! list(APPEND MPI_PREFIX_PATH "${SystemPrefixDir}/${MpiPackageDir}")
! endif()
! endforeach(MpiPackageDir)
! endforeach(SystemPrefixDir)
!
! # Most mpi distros have some form of mpiexec which gives us something we can reliably look for.
find_program(MPIEXEC
NAMES mpiexec mpirun lamexec
! PATHS ${MPI_PREFIX_PATH}
! PATH_SUFFIXES bin
! DOC "Executable for running MPI programs."
! )
!
! # call get_filename_component twice to remove mpiexec and the directory it exists in (typically bin).
! # This gives us a fairly reliable base directory to search for /bin /lib and /include from.
! get_filename_component(MPI_BASE_DIR "${MPIEXEC}" PATH)
! get_filename_component(MPI_BASE_DIR "${MPI_BASE_DIR}" PATH)
!
! # If there is an mpi compiler find it and interogate (farther below) it for the include
! # and lib dirs otherwise we will continue to search from ${MPI_BASE_DIR}.
! find_program(MPI_COMPILER
! NAMES mpic++ mpicxx mpiCC mpicc
! HINTS "${MPI_BASE_DIR}"
! PATH_SUFFIXES bin
! DOC "MPI compiler. Used only to detect MPI compilation flags.")
! mark_as_advanced(MPI_COMPILER)
set(MPIEXEC_NUMPROC_FLAG "-np" CACHE STRING "Flag used by MPI to specify the number of processes for MPIEXEC; the next option will be the number of processes.")
***************
*** 86,90 ****
set(MPIEXEC_POSTFLAGS "" CACHE STRING "These flags will come after all flags given to MPIEXEC.")
set(MPIEXEC_MAX_NUMPROCS "2" CACHE STRING "Maximum number of processors available to run MPI applications.")
! mark_as_advanced(MPIEXEC MPIEXEC_NUMPROC_FLAG MPIEXEC_PREFLAGS
MPIEXEC_POSTFLAGS MPIEXEC_MAX_NUMPROCS)
--- 123,127 ----
set(MPIEXEC_POSTFLAGS "" CACHE STRING "These flags will come after all flags given to MPIEXEC.")
set(MPIEXEC_MAX_NUMPROCS "2" CACHE STRING "Maximum number of processors available to run MPI applications.")
! mark_as_advanced(MPIEXEC MPIEXEC_NUMPROC_FLAG MPIEXEC_PREFLAGS
MPIEXEC_POSTFLAGS MPIEXEC_MAX_NUMPROCS)
***************
*** 96,101 ****
# that we have either Open MPI or a newer version of LAM-MPI, and
# implies that -showme:link will also work.
! exec_program(${MPI_COMPILER}
! ARGS -showme:compile
OUTPUT_VARIABLE MPI_COMPILE_CMDLINE
RETURN_VALUE MPI_COMPILER_RETURN)
--- 133,139 ----
# that we have either Open MPI or a newer version of LAM-MPI, and
# implies that -showme:link will also work.
! # Note that Windows distros do not have an mpi compiler to interogate.
! exec_program(${MPI_COMPILER}
! ARGS -showme:compile
OUTPUT_VARIABLE MPI_COMPILE_CMDLINE
RETURN_VALUE MPI_COMPILER_RETURN)
***************
*** 104,108 ****
# If we appear to have -showme:compile, then we should also have
# -showme:link. Try it.
! exec_program(${MPI_COMPILER}
ARGS -showme:link
OUTPUT_VARIABLE MPI_LINK_CMDLINE
--- 142,146 ----
# If we appear to have -showme:compile, then we should also have
# -showme:link. Try it.
! exec_program(${MPI_COMPILER}
ARGS -showme:link
OUTPUT_VARIABLE MPI_LINK_CMDLINE
***************
*** 118,126 ****
else (MPI_COMPILER_RETURN EQUAL 0)
# Older versions of LAM-MPI have "-showme". Try it.
! exec_program(${MPI_COMPILER}
ARGS -showme
OUTPUT_VARIABLE MPI_COMPILE_CMDLINE
RETURN_VALUE MPI_COMPILER_RETURN)
! endif (MPI_COMPILER_RETURN EQUAL 0)
if (MPI_COMPILER_RETURN EQUAL 0)
--- 156,164 ----
else (MPI_COMPILER_RETURN EQUAL 0)
# Older versions of LAM-MPI have "-showme". Try it.
! exec_program(${MPI_COMPILER}
ARGS -showme
OUTPUT_VARIABLE MPI_COMPILE_CMDLINE
RETURN_VALUE MPI_COMPILER_RETURN)
! endif (MPI_COMPILER_RETURN EQUAL 0)
if (MPI_COMPILER_RETURN EQUAL 0)
***************
*** 128,136 ****
else (MPI_COMPILER_RETURN EQUAL 0)
# MPICH uses "-show". Try it.
! exec_program(${MPI_COMPILER}
ARGS -show
OUTPUT_VARIABLE MPI_COMPILE_CMDLINE
RETURN_VALUE MPI_COMPILER_RETURN)
! endif (MPI_COMPILER_RETURN EQUAL 0)
if (MPI_COMPILER_RETURN EQUAL 0)
--- 166,174 ----
else (MPI_COMPILER_RETURN EQUAL 0)
# MPICH uses "-show". Try it.
! exec_program(${MPI_COMPILER}
ARGS -show
OUTPUT_VARIABLE MPI_COMPILE_CMDLINE
RETURN_VALUE MPI_COMPILER_RETURN)
! endif (MPI_COMPILER_RETURN EQUAL 0)
if (MPI_COMPILER_RETURN EQUAL 0)
***************
*** 168,177 ****
list(APPEND MPI_INCLUDE_PATH_WORK ${IPATH})
endforeach(IPATH)
!
if (NOT MPI_INCLUDE_PATH_WORK)
if (MPI_COMPILER_MAY_HAVE_INCLIBDIRS)
# The compile command line didn't have any include paths on it,
# but we may have -showme:incdirs. Use it.
! exec_program(${MPI_COMPILER}
ARGS -showme:incdirs
OUTPUT_VARIABLE MPI_INCLUDE_PATH_WORK
--- 206,215 ----
list(APPEND MPI_INCLUDE_PATH_WORK ${IPATH})
endforeach(IPATH)
!
if (NOT MPI_INCLUDE_PATH_WORK)
if (MPI_COMPILER_MAY_HAVE_INCLIBDIRS)
# The compile command line didn't have any include paths on it,
# but we may have -showme:incdirs. Use it.
! exec_program(${MPI_COMPILER}
ARGS -showme:incdirs
OUTPUT_VARIABLE MPI_INCLUDE_PATH_WORK
***************
*** 184,188 ****
# If all else fails, just search for mpi.h in the normal include
# paths.
! find_path(MPI_INCLUDE_PATH mpi.h)
set(MPI_INCLUDE_PATH_WORK ${MPI_INCLUDE_PATH})
endif (NOT MPI_INCLUDE_PATH_WORK)
--- 222,229 ----
# If all else fails, just search for mpi.h in the normal include
# paths.
! find_path(MPI_INCLUDE_PATH mpi.h
! HINTS ${MPI_BASE_DIR} ${MPI_PREFIX_PATH}
! PATH_SUFFIXES include
! )
set(MPI_INCLUDE_PATH_WORK ${MPI_INCLUDE_PATH})
endif (NOT MPI_INCLUDE_PATH_WORK)
***************
*** 201,205 ****
# The compile command line didn't have any linking paths on it,
# but we may have -showme:libdirs. Use it.
! exec_program(${MPI_COMPILER}
ARGS -showme:libdirs
OUTPUT_VARIABLE MPI_LINK_PATH
--- 242,246 ----
# The compile command line didn't have any linking paths on it,
# but we may have -showme:libdirs. Use it.
! exec_program(${MPI_COMPILER}
ARGS -showme:libdirs
OUTPUT_VARIABLE MPI_LINK_PATH
***************
*** 262,300 ****
set(MPI_LINK_FLAGS ${MPI_LINK_FLAGS_WORK} CACHE STRING "MPI linking flags" FORCE)
else (MPI_COMPILE_CMDLINE)
! find_path(MPI_INCLUDE_PATH mpi.h
! /usr/local/include
! /usr/include
! /usr/include/mpi
! /usr/local/mpi/include
! "$ENV{SystemDrive}/Program Files/MPICH/SDK/Include"
! "${ProgramFiles}/MPICH2/include"
! "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Include"
! "$ENV{SystemDrive}/Program Files/Microsoft HPC Pack 2008 SDK/Include"
)
# 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
! "$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib"
! "${ProgramFiles}/MPICH2/Lib"
! "$ENV{SystemDrive}/Program Files/Microsoft Compute Cluster Pack/Lib/${MS_MPI_ARCH_DIR}"
! "$ENV{SystemDrive}/Program Files/Microsoft HPC Pack 2008 SDK/Lib/${MS_MPI_ARCH_DIR}"
)
- find_library(MPI_LIBRARY
- NAMES mpich2
- PATHS
- "${ProgramFiles}/MPICH2/Lib")
! find_library(MPI_EXTRA_LIBRARY
NAMES mpi++
! PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
! "$ENV{SystemDrive}/Program Files/MPICH/SDK/Lib"
DOC "Extra MPI libraries to link against.")
--- 303,329 ----
set(MPI_LINK_FLAGS ${MPI_LINK_FLAGS_WORK} CACHE STRING "MPI linking flags" FORCE)
else (MPI_COMPILE_CMDLINE)
! # No MPI compiler to interogate so attempt to find everything with find functions.
! find_path(MPI_INCLUDE_PATH mpi.h
! HINTS ${MPI_BASE_DIR} ${MPI_PREFIX_PATH}
! PATH_SUFFIXES include
)
# Decide between 32-bit and 64-bit libraries for Microsoft's MPI
! if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
set(MS_MPI_ARCH_DIR amd64)
! else()
set(MS_MPI_ARCH_DIR i386)
! endif()
! find_library(MPI_LIBRARY
NAMES mpi mpich msmpi
! HINTS ${MPI_BASE_DIR} ${MPI_PREFIX_PATH}
! PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR}
)
! find_library(MPI_EXTRA_LIBRARY
NAMES mpi++
! HINTS ${MPI_BASE_DIR} ${MPI_PREFIX_PATH}
! PATH_SUFFIXES lib
DOC "Extra MPI libraries to link against.")
***************
*** 309,313 ****
endif("${MPI_LIBRARY}" MATCHES "mpich.rts")
! # Set up extra variables to conform to
if (MPI_EXTRA_LIBRARY)
set(MPI_LIBRARIES ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARY})
--- 338,342 ----
endif("${MPI_LIBRARY}" MATCHES "mpich.rts")
! # Set up extra variables to conform to
if (MPI_EXTRA_LIBRARY)
set(MPI_LIBRARIES ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARY})
***************
*** 323,329 ****
include(FindPackageHandleStandardArgs)
! # handle the QUIETLY and REQUIRED arguments
find_package_handle_standard_args(MPI DEFAULT_MSG MPI_LIBRARY MPI_INCLUDE_PATH)
! mark_as_advanced(MPI_INCLUDE_PATH MPI_COMPILE_FLAGS MPI_LINK_FLAGS MPI_LIBRARY
MPI_EXTRA_LIBRARY)
--- 352,363 ----
include(FindPackageHandleStandardArgs)
! # handle the QUIETLY and REQUIRED arguments
find_package_handle_standard_args(MPI DEFAULT_MSG MPI_LIBRARY MPI_INCLUDE_PATH)
! mark_as_advanced(MPI_INCLUDE_PATH MPI_COMPILE_FLAGS MPI_LINK_FLAGS MPI_LIBRARY
MPI_EXTRA_LIBRARY)
+
+ # unset to cleanup namespace
+ unset(MPI_PACKAGE_DIR)
+ unset(MPI_PREFIX_PATH)
+ unset(MPI_BASE_DIR)
Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.38.2.1
retrieving revision 1.38.2.2
diff -C 2 -d -r1.38.2.1 -r1.38.2.2
*** NSIS.template.in 9 Oct 2009 20:11:11 -0000 1.38.2.1
--- NSIS.template.in 28 Oct 2009 16:14:56 -0000 1.38.2.2
***************
*** 19,23 ****
Var ADD_TO_PATH_CURRENT_USER
Var INSTALL_DESKTOP
!
;--------------------------------
;Include Modern UI
--- 19,23 ----
Var ADD_TO_PATH_CURRENT_USER
Var INSTALL_DESKTOP
! Var IS_DEFAULT_INSTALLDIR
;--------------------------------
;Include Modern UI
***************
*** 893,898 ****
!insertmacro SectionList "InitSection"
StrCpy $SV_ALLUSERS "JustMe"
! StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
ClearErrors
--- 893,909 ----
!insertmacro SectionList "InitSection"
+ ; check to see if /D has been used to change
+ ; the install directory by comparing it to the
+ ; install directory that is expected to be the
+ ; default
+ StrCpy $IS_DEFAULT_INSTALLDIR 0
+ StrCmp "$INSTDIR" "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
+ StrCpy $IS_DEFAULT_INSTALLDIR 1
+
StrCpy $SV_ALLUSERS "JustMe"
! ; if default install dir then change the default
! ; if it is installed for JustMe
! StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
! StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
ClearErrors
***************
*** 918,923 ****
done:
! StrCmp $SV_ALLUSERS "AllUsers" 0 +2
! StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
--- 929,935 ----
done:
! StrCmp $SV_ALLUSERS "AllUsers" 0 +3
! StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
! StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.45.2.2
retrieving revision 1.45.2.3
diff -C 2 -d -r1.45.2.2 -r1.45.2.3
*** FindBoost.cmake 9 Oct 2009 20:11:10 -0000 1.45.2.2
--- FindBoost.cmake 28 Oct 2009 16:14:56 -0000 1.45.2.3
***************
*** 570,573 ****
--- 570,575 ----
elseif (MSVC90)
SET (_boost_COMPILER "-vc90")
+ elseif (MSVC10)
+ SET (_boost_COMPILER "-vc100")
elseif (MSVC80)
SET (_boost_COMPILER "-vc80")
Index: FindSquish.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSquish.cmake,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -C 2 -d -r1.1.4.1 -r1.1.4.2
*** FindSquish.cmake 1 Oct 2009 21:20:33 -0000 1.1.4.1
--- FindSquish.cmake 28 Oct 2009 16:14:56 -0000 1.1.4.2
***************
*** 4,28 ****
#
# ---- Variables and Macros
! # SQUISH_FOUND If false, don't try to use Squish
! # SQUISH_VERSION_MAJOR The major version of Squish found
! # SQUISH_VERSION_MINOR The minor version of Squish found
! # SQUISH_VERSION_PATCH The patch version of Squish found
#
! # SQUISH_INSTALL_DIR The Squish installation directory (containing bin, lib, etc)
! # SQUISH_SERVER_EXECUTABLE The squishserver executable
! # SQUISH_CLIENT_EXECUTABLE The squishrunner executable
#
! # SQUISH_INSTALL_DIR_FOUND Was the install directory found?
! # SQUISH_SERVER_EXECUTABLE_FOUND Was the server executable found?
! # SQUISH_CLIENT_EXECUTABLE_FOUND Was the client executable found?
#
# macro SQUISH_ADD_TEST(testName applicationUnderTest testSuite testCase)
#
# ---- Typical Use
! # ENABLE_TESTING()
! # FIND_PACKAGE(Squish)
! # IF (SQUISH_FOUND)
! # SQUISH_ADD_TEST(myTestName myApplication testSuiteName testCaseName)
! # ENDIF (SQUISH_FOUND)
#
--- 4,28 ----
#
# ---- Variables and Macros
! # SQUISH_FOUND If false, don't try to use Squish
! # SQUISH_VERSION_MAJOR The major version of Squish found
! # SQUISH_VERSION_MINOR The minor version of Squish found
! # SQUISH_VERSION_PATCH The patch version of Squish found
#
! # SQUISH_INSTALL_DIR The Squish installation directory (containing bin, lib, etc)
! # SQUISH_SERVER_EXECUTABLE The squishserver executable
! # SQUISH_CLIENT_EXECUTABLE The squishrunner executable
#
! # SQUISH_INSTALL_DIR_FOUND Was the install directory found?
! # SQUISH_SERVER_EXECUTABLE_FOUND Was the server executable found?
! # SQUISH_CLIENT_EXECUTABLE_FOUND Was the client executable found?
#
# macro SQUISH_ADD_TEST(testName applicationUnderTest testSuite testCase)
#
# ---- Typical Use
! # ENABLE_TESTING()
! # FIND_PACKAGE(Squish)
! # IF (SQUISH_FOUND)
! # SQUISH_ADD_TEST(myTestName myApplication testSuiteName testCaseName)
! # ENDIF (SQUISH_FOUND)
#
Index: CMakeFortranCompilerId.F.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeFortranCompilerId.F.in,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** CMakeFortranCompilerId.F.in 7 Aug 2009 14:13:04 -0000 1.4
--- CMakeFortranCompilerId.F.in 28 Oct 2009 16:14:54 -0000 1.4.2.1
***************
*** 7,10 ****
--- 7,12 ----
#elif defined(__SUNPRO_F90) || defined(__SUNPRO_F95)
PRINT *, 'INFO:compiler[SunPro]'
+ #elif defined(__G95__)
+ PRINT *, 'INFO:compiler[G95]'
#elif defined(__GNUC__)
PRINT *, 'INFO:compiler[GNU]'
Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.41.2.1
retrieving revision 1.41.2.2
diff -C 2 -d -r1.41.2.1 -r1.41.2.2
*** FindJNI.cmake 1 Oct 2009 21:20:29 -0000 1.41.2.1
--- FindJNI.cmake 28 Oct 2009 16:14:56 -0000 1.41.2.2
***************
*** 68,76 ****
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
)
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
! $ENV{JAVA_HOME}/jre/lib/{libarch}
! $ENV{JAVA_HOME}/jre/lib
! $ENV{JAVA_HOME}/lib
! $ENV{JAVA_HOME}
/usr/lib
/usr/local/lib
--- 68,79 ----
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
)
+
+ FILE(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME)
+
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
! ${_JAVA_HOME}/jre/lib/{libarch}
! ${_JAVA_HOME}/jre/lib
! ${_JAVA_HOME}/lib
! ${_JAVA_HOME}
/usr/lib
/usr/local/lib
***************
*** 107,111 ****
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
! $ENV{JAVA_HOME}/include
/usr/include
/usr/local/include
--- 110,114 ----
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
! ${_JAVA_HOME}/include
/usr/include
/usr/local/include
Index: FindCUDA.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCUDA.cmake,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -C 2 -d -r1.2.2.2 -r1.2.2.3
*** FindCUDA.cmake 9 Oct 2009 20:11:10 -0000 1.2.2.2
--- FindCUDA.cmake 28 Oct 2009 16:14:56 -0000 1.2.2.3
***************
*** 470,475 ****
find_program(CUDA_NVCC_EXECUTABLE
NAMES nvcc
! PATHS "${CUDA_TOOLKIT_ROOT_DIR}/bin64"
! "${CUDA_TOOLKIT_ROOT_DIR}/bin"
ENV CUDA_BIN_PATH
NO_DEFAULT_PATH
--- 470,475 ----
find_program(CUDA_NVCC_EXECUTABLE
NAMES nvcc
! PATHS "${CUDA_TOOLKIT_ROOT_DIR}/bin"
! "${CUDA_TOOLKIT_ROOT_DIR}/bin64"
ENV CUDA_BIN_PATH
NO_DEFAULT_PATH
Index: FeatureSummary.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FeatureSummary.cmake,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C 2 -d -r1.4.2.1 -r1.4.2.2
*** FeatureSummary.cmake 1 Oct 2009 21:20:23 -0000 1.4.2.1
--- FeatureSummary.cmake 28 Oct 2009 16:14:54 -0000 1.4.2.2
***************
*** 33,37 ****
# License text for the above reference.)
! MACRO(SET_FEATURE_INFO _name _desc)
SET(_url "${ARGV2}")
SET(_comment "${ARGV3}")
--- 33,37 ----
# License text for the above reference.)
! FUNCTION(SET_FEATURE_INFO _name _desc)
SET(_url "${ARGV2}")
SET(_comment "${ARGV3}")
***************
*** 43,50 ****
SET_PROPERTY(GLOBAL PROPERTY ${_name}_COMMENT "${_comment}" )
ENDIF(_comment MATCHES ".+")
! ENDMACRO(SET_FEATURE_INFO)
! MACRO(_PRINT_FEATURES _property _text)
SET(_currentFeatureText "${_text}")
GET_PROPERTY(_EnabledFeatures GLOBAL PROPERTY ${_property})
--- 43,50 ----
SET_PROPERTY(GLOBAL PROPERTY ${_name}_COMMENT "${_comment}" )
ENDIF(_comment MATCHES ".+")
! ENDFUNCTION(SET_FEATURE_INFO)
! FUNCTION(_PRINT_FEATURES _property _text)
SET(_currentFeatureText "${_text}")
GET_PROPERTY(_EnabledFeatures GLOBAL PROPERTY ${_property})
***************
*** 65,78 ****
ENDFOREACH(_currentFeature)
MESSAGE(STATUS "${_currentFeatureText}\n")
! ENDMACRO(_PRINT_FEATURES)
! MACRO(PRINT_ENABLED_FEATURES)
_PRINT_FEATURES( ENABLED_FEATURES "Enabled features:")
! ENDMACRO(PRINT_ENABLED_FEATURES)
! MACRO(PRINT_DISABLED_FEATURES)
_PRINT_FEATURES( DISABLED_FEATURES "Disabled features:")
! ENDMACRO(PRINT_DISABLED_FEATURES)
--- 65,78 ----
ENDFOREACH(_currentFeature)
MESSAGE(STATUS "${_currentFeatureText}\n")
! ENDFUNCTION(_PRINT_FEATURES)
! FUNCTION(PRINT_ENABLED_FEATURES)
_PRINT_FEATURES( ENABLED_FEATURES "Enabled features:")
! ENDFUNCTION(PRINT_ENABLED_FEATURES)
! FUNCTION(PRINT_DISABLED_FEATURES)
_PRINT_FEATURES( DISABLED_FEATURES "Disabled features:")
! ENDFUNCTION(PRINT_DISABLED_FEATURES)
--- NEW FILE: CMakeVerifyManifest.cmake ---
# CMakeVerifyManifest.cmake
#
# This script is used to verify that embeded manifests and
# side by side manifests for a project match. To run this
# script, cd to a directory and run the script with cmake -P.
# On the command line you can pass in versions that are OK even
# if not found in the .manifest files. For example,
# cmake -Dallow_versions=8.0.50608.0 -PCmakeVerifyManifest.cmake
# could be used to allow an embeded manifest of 8.0.50608.0
# to be used in a project even if that version was not found
# in the .manifest file.
# This script first recursively globs *.manifest files from
# the current directory. Then globs *.exe and *.dll. Each
# .exe and .dll is scanned for embeded manifests and the versions
# of CRT are compared to those found in the .manifest files
# from the first glob.
#=============================================================================
# Copyright 2008-2009 Kitware, Inc.
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distributed this file outside of CMake, substitute the full
# License text for the above reference.)
# crt_version:
# function to extract the CRT version from a file
# this can be passed a .exe, .dll, or a .manifest file
# it will put the list of versions found into the variable
# specified by list_var
function(crt_version file list_var)
file(STRINGS "${file}" strings REGEX "Microsoft.VC...CRT" NEWLINE_CONSUME)
foreach(s ${strings})
set(has_match 1)
string(REGEX
REPLACE ".*<assembly.*\"Microsoft.VC...CRT\".*version=\"([^\"]*)\".*</assembly>.*$" "\\1"
version "${s}")
if(NOT "${version}" STREQUAL "")
list(APPEND version_list ${version})
else()
message(FATAL_ERROR "Parse error could not find version in [${s}]")
endif()
endforeach(s)
if(NOT DEFINED has_match)
message("Information: no embeded manifest in: ${file}")
return()
endif()
list(APPEND version_list ${${list_var}})
list(REMOVE_DUPLICATES version_list)
if(version_list)
set(${list_var} ${version_list} PARENT_SCOPE)
endif()
endfunction(crt_version)
set(fatal_error FALSE)
# check_version:
#
# test a file against the shipped manifest versions
# for a directory
function(check_version file manifest_versions)
set(manifest_versions ${manifest_versions} ${allow_versions})
# collect versions for a given file
crt_version(${file} file_versions)
# see if the versions
foreach(ver ${file_versions})
list(FIND manifest_versions "${ver}" found_version)
if("${found_version}" EQUAL -1)
message("ERROR: ${file} uses ${ver} not found in shipped manifests:[${manifest_versions}].")
set(fatal_error TRUE PARENT_SCOPE)
endif()
endforeach(ver)
list(LENGTH file_versions len)
if(${len} GREATER 1)
message("WARNING: found more than one version of MICROSOFT.VC80.CRT referenced in ${file}: [${file_versions}]")
endif()
endfunction()
# collect up the versions of CRT that are shipped
# in .manifest files
set(manifest_version_list )
file(GLOB_RECURSE manifest_files "*.manifest")
foreach(f ${manifest_files})
crt_version("${f}" manifest_version_list)
endforeach(f)
list(LENGTH manifest_version_list LEN)
if(LEN EQUAL 0)
message(FATAL_ERROR "No .manifest files found, no version check can be done.")
endif()
message("Versions found in ${manifest_files}: ${manifest_version_list}")
if(DEFINED allow_versions)
message("Extra versions allowed: ${allow_versions}")
endif()
# now find all .exe and .dll files
# and call check_version on each of them
file(GLOB_RECURSE exe_files "*.exe")
file(GLOB_RECURSE dll_files "*.dll")
set(exe_files ${exe_files} ${dll_files})
foreach(f ${exe_files})
check_version(${f} "${manifest_version_list}")
endforeach()
# report a fatal error if there were any so that cmake will return
# a non zero value
if(fatal_error)
message(FATAL_ERROR "This distribution embeds dll "
" versions that it does not ship, and may not work on other machines.")
endif()
Index: CMakeVS10FindMake.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeVS10FindMake.cmake,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C 2 -d -r1.2.2.1 -r1.2.2.2
*** CMakeVS10FindMake.cmake 1 Oct 2009 21:20:21 -0000 1.2.2.1
--- CMakeVS10FindMake.cmake 28 Oct 2009 16:14:54 -0000 1.2.2.2
***************
*** 22,27 ****
NAMES MSBuild
HINTS
! "$ENV{SYSTEMROOT}/Microsoft.NET/Framework/v4.0.20506/"
! c:/WINDOWS/Microsoft.NET/Framework/v4.0.20506/
)
--- 22,27 ----
NAMES MSBuild
HINTS
! "$ENV{SYSTEMROOT}/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;CLR Version]/"
! "c:/WINDOWS/Microsoft.NET/Framework/[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0;CLR Version]/"
)
Index: FindOpenSceneGraph.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenSceneGraph.cmake,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C 2 -d -r1.4.2.1 -r1.4.2.2
*** FindOpenSceneGraph.cmake 1 Oct 2009 21:20:32 -0000 1.4.2.1
--- FindOpenSceneGraph.cmake 28 Oct 2009 16:14:56 -0000 1.4.2.2
***************
*** 97,107 ****
"Detected OSG_INCLUDE_DIR = ${OSG_INCLUDE_DIR}")
endif()
!
! file(READ "${OSG_INCLUDE_DIR}/osg/Version" _osg_Version_contents)
string(REGEX MATCH ".*#define OSG_VERSION_MAJOR[ \t]+[0-9]+.*"
! _osg_old_defines ${_osg_Version_contents})
string(REGEX MATCH ".*#define OPENSCENEGRAPH_MAJOR_VERSION[ \t]+[0-9]+.*"
! _osg_new_defines ${_osg_Version_contents})
if(_osg_old_defines)
string(REGEX REPLACE ".*#define OSG_VERSION_MAJOR[ \t]+([0-9]+).*"
--- 97,116 ----
"Detected OSG_INCLUDE_DIR = ${OSG_INCLUDE_DIR}")
endif()
!
! set(_osg_Version_file "${OSG_INCLUDE_DIR}/osg/Version")
! if("${OSG_INCLUDE_DIR}" MATCHES "\\.framework$" AND NOT EXISTS "${_osg_Version_file}")
! set(_osg_Version_file "${OSG_INCLUDE_DIR}/Headers/Version")
! endif()
!
! if(EXISTS "${_osg_Version_file}")
! file(READ "${_osg_Version_file}" _osg_Version_contents)
! else()
! set(_osg_Version_contents "unknown")
! endif()
string(REGEX MATCH ".*#define OSG_VERSION_MAJOR[ \t]+[0-9]+.*"
! _osg_old_defines "${_osg_Version_contents}")
string(REGEX MATCH ".*#define OPENSCENEGRAPH_MAJOR_VERSION[ \t]+[0-9]+.*"
! _osg_new_defines "${_osg_Version_contents}")
if(_osg_old_defines)
string(REGEX REPLACE ".*#define OSG_VERSION_MAJOR[ \t]+([0-9]+).*"
Index: DartConfiguration.tcl.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/DartConfiguration.tcl.in,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C 2 -d -r1.11 -r1.11.2.1
*** DartConfiguration.tcl.in 2 Sep 2009 14:08:38 -0000 1.11
--- DartConfiguration.tcl.in 28 Oct 2009 16:14:54 -0000 1.11.2.1
***************
*** 46,50 ****
UpdateType: @UPDATE_TYPE@
! # Dynamic analisys and coverage
PurifyCommand: @PURIFYCOMMAND@
ValgrindCommand: @VALGRIND_COMMAND@
--- 46,53 ----
UpdateType: @UPDATE_TYPE@
! # Compiler info
! Compiler: @CMAKE_CXX_COMPILER@
!
! # Dynamic analysis and coverage
PurifyCommand: @PURIFYCOMMAND@
ValgrindCommand: @VALGRIND_COMMAND@
More information about the Cmake-commits
mailing list