[Cmake-commits] [cmake-commits] hoffman committed CMakeASM_MASMInformation.cmake NONE 1.1.2.2 CMakeDetermineASM_MASMCompiler.cmake NONE 1.1.2.2 CMakeTestASM_MASMCompiler.cmake NONE 1.1.2.2 CPackRPM.cmake 1.7.2.1 1.7.2.2 FindCurses.cmake 1.10.2.5 1.10.2.6 FindDoxygen.cmake 1.14 1.14.12.1 FindEXPAT.cmake 1.4 1.4.2.1 FindLibXml2.cmake 1.4.2.1 1.4.2.2 FindQt4.cmake 1.96.2.17 1.96.2.18 FindSquish.cmake NONE 1.1.2.2 FindwxWidgets.cmake 1.18.2.5 1.18.2.6 GetPrerequisites.cmake 1.1.2.3 1.1.2.4 SquishRunTestCase.bat NONE 1.1.2.2 SquishRunTestCase.sh NONE 1.1.2.2 SquishTestScript.cmake NONE 1.1.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Dec 31 10:14:32 EST 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv19604/Modules
Modified Files:
Tag: CMake-2-6
CPackRPM.cmake FindCurses.cmake FindDoxygen.cmake
FindEXPAT.cmake FindLibXml2.cmake FindQt4.cmake
FindwxWidgets.cmake GetPrerequisites.cmake
Added Files:
Tag: CMake-2-6
CMakeASM_MASMInformation.cmake
CMakeDetermineASM_MASMCompiler.cmake
CMakeTestASM_MASMCompiler.cmake FindSquish.cmake
SquishRunTestCase.bat SquishRunTestCase.sh
SquishTestScript.cmake
Log Message:
ENH: merge fixes for RC 6
Index: FindCurses.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCurses.cmake,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -C 2 -d -r1.10.2.5 -r1.10.2.6
*** FindCurses.cmake 22 Sep 2008 14:05:16 -0000 1.10.2.5
--- FindCurses.cmake 31 Dec 2008 15:14:19 -0000 1.10.2.6
***************
*** 16,20 ****
FIND_LIBRARY(CURSES_NCURSES_LIBRARY NAMES ncurses )
-
SET(CURSES_USE_NCURSES FALSE)
--- 16,19 ----
***************
*** 81,99 ****
# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload
# a cache wqith these variables set
# only put ncurses include and library into
# variables if they are found
IF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
!
SET(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH}"
! CACHE FILEPATH "The curses include path")
SET(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}"
! CACHE FILEPATH "The curses library")
ENDIF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
ENDIF(NOT CURSES_USE_NCURSES)
-
-
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )
--- 80,109 ----
# for compatibility with older FindCurses.cmake this has to be in the cache
# FORCE must not be used since this would break builds which preload
+ # however if the value of the variable has NOTFOUND in it, then
+ # it is OK to force, and we need to force in order to have it work.
# a cache wqith these variables set
# only put ncurses include and library into
# variables if they are found
+ IF(NOT CURSES_NCURSES_INCLUDE_PATH AND CURSES_HAVE_NCURSES_NCURSES_H)
+ GET_FILENAME_COMPONENT(CURSES_NCURSES_INCLUDE_PATH
+ "${CURSES_HAVE_NCURSES_NCURSES_H}" PATH)
+ ENDIF(NOT CURSES_NCURSES_INCLUDE_PATH AND CURSES_HAVE_NCURSES_NCURSES_H)
IF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
! SET( FORCE_IT )
! IF(CURSES_INCLUDE_PATH MATCHES NOTFOUND)
! SET(FORCE_IT FORCE)
! ENDIF(CURSES_INCLUDE_PATH MATCHES NOTFOUND)
SET(CURSES_INCLUDE_PATH "${CURSES_NCURSES_INCLUDE_PATH}"
! CACHE FILEPATH "The curses include path" ${FORCE_IT})
! SET( FORCE_IT)
! IF(CURSES_LIBRARY MATCHES NOTFOUND)
! SET(FORCE_IT FORCE)
! ENDIF(CURSES_LIBRARY MATCHES NOTFOUND)
SET(CURSES_LIBRARY "${CURSES_NCURSES_LIBRARY}"
! CACHE FILEPATH "The curses library" ${FORCE_IT})
ENDIF(CURSES_NCURSES_INCLUDE_PATH AND CURSES_NCURSES_LIBRARY)
ENDIF(NOT CURSES_USE_NCURSES)
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr HINTS "${_cursesLibDir}")
FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr )
--- NEW FILE: FindSquish.cmake ---
#
# ---- Find Squish
# This module can be used to find Squish (currently support is aimed at version 3).
#
# ---- 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)
#
SET(SQUISH_INSTALL_DIR_STRING "Directory containing the bin, doc, and lib directories for Squish; this should be the root of the installation directory.")
SET(SQUISH_SERVER_EXECUTABLE_STRING "The squishserver executable program.")
SET(SQUISH_CLIENT_EXECUTABLE_STRING "The squishclient executable program.")
# Search only if the location is not already known.
IF(NOT SQUISH_INSTALL_DIR)
# Get the system search path as a list.
IF(UNIX)
STRING(REGEX MATCHALL "[^:]+" SQUISH_INSTALL_DIR_SEARCH1 "$ENV{PATH}")
ELSE(UNIX)
STRING(REGEX REPLACE "\\\\" "/" SQUISH_INSTALL_DIR_SEARCH1 "$ENV{PATH}")
ENDIF(UNIX)
STRING(REGEX REPLACE "/;" ";" SQUISH_INSTALL_DIR_SEARCH2 ${SQUISH_INSTALL_DIR_SEARCH1})
# Construct a set of paths relative to the system search path.
SET(SQUISH_INSTALL_DIR_SEARCH "")
FOREACH(dir ${SQUISH_INSTALL_DIR_SEARCH2})
SET(SQUISH_INSTALL_DIR_SEARCH ${SQUISH_INSTALL_DIR_SEARCH} "${dir}/../lib/fltk")
ENDFOREACH(dir)
# Look for an installation
FIND_PATH(SQUISH_INSTALL_DIR bin/squishrunner
# Look for an environment variable SQUISH_INSTALL_DIR.
$ENV{SQUISH_INSTALL_DIR}
# Look in places relative to the system executable search path.
${SQUISH_INSTALL_DIR_SEARCH}
# Look in standard UNIX install locations.
#/usr/local/squish
DOC "The ${SQUISH_INSTALL_DIR_STRING}"
)
ENDIF(NOT SQUISH_INSTALL_DIR)
# search for the executables
IF(SQUISH_INSTALL_DIR)
SET(SQUISH_INSTALL_DIR_FOUND 1)
# find the client program
IF(NOT SQUISH_CLIENT_EXECUTABLE)
FIND_PROGRAM(SQUISH_CLIENT_EXECUTABLE ${SQUISH_INSTALL_DIR}/bin/squishrunner DOC "The ${SQUISH_CLIENT_EXECUTABLE_STRING}")
ENDIF(NOT SQUISH_CLIENT_EXECUTABLE)
# find the server program
IF(NOT SQUISH_SERVER_EXECUTABLE)
FIND_PROGRAM(SQUISH_SERVER_EXECUTABLE ${SQUISH_INSTALL_DIR}/bin/squishserver DOC "The ${SQUISH_SERVER_EXECUTABLE_STRING}")
ENDIF(NOT SQUISH_SERVER_EXECUTABLE)
ELSE(SQUISH_INSTALL_DIR)
SET(SQUISH_INSTALL_DIR_FOUND 0)
ENDIF(SQUISH_INSTALL_DIR)
# record if executables are set
IF(SQUISH_CLIENT_EXECUTABLE)
SET(SQUISH_CLIENT_EXECUTABLE_FOUND 1)
ELSE(SQUISH_CLIENT_EXECUTABLE)
SET(SQUISH_CLIENT_EXECUTABLE_FOUND 0)
ENDIF(SQUISH_CLIENT_EXECUTABLE)
IF(SQUISH_SERVER_EXECUTABLE)
SET(SQUISH_SERVER_EXECUTABLE_FOUND 1)
ELSE(SQUISH_SERVER_EXECUTABLE)
SET(SQUISH_SERVER_EXECUTABLE_FOUND 0)
ENDIF(SQUISH_SERVER_EXECUTABLE)
# record if Squish was found
SET(SQUISH_FOUND 1)
FOREACH(var SQUISH_INSTALL_DIR_FOUND SQUISH_CLIENT_EXECUTABLE_FOUND SQUISH_SERVER_EXECUTABLE_FOUND)
IF(NOT ${var})
SET(SQUISH_FOUND 0)
ENDIF(NOT ${var})
ENDFOREACH(var)
MACRO(SQUISH_ADD_TEST testName testAUT testCase envVars testWraper)
ADD_TEST(${testName}
${CMAKE_COMMAND} -V -VV
"-Dsquish_aut:STRING=${testAUT}"
"-Dsquish_server_executable:STRING=${SQUISH_SERVER_EXECUTABLE}"
"-Dsquish_client_executable:STRING=${SQUISH_CLIENT_EXECUTABLE}"
"-Dsquish_libqtdir:STRING=${QT_LIBRARY_DIR}"
"-Dsquish_test_case:STRING=${testCase}"
"-Dsquish_env_vars:STRING=${envVars}"
"-Dsquish_wrapper:STRING=${testWraper}"
-P "${CMAKE_ROOT}/Modules/SquishTestScript.cmake"
)
SET_TESTS_PROPERTIES(${testName}
PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED;ERROR;FATAL"
)
ENDMACRO(SQUISH_ADD_TEST)
--- NEW FILE: CMakeDetermineASM_MASMCompiler.cmake ---
# Find the MS assembler (masm or masm64)
SET(ASM_DIALECT "_MASM")
# if we are using the 64bit cl compiler, assume we also want the 64bit assembler
IF(CMAKE_CL_64)
SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ml64)
ELSE(CMAKE_CL_64)
SET(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ml)
ENDIF(CMAKE_CL_64)
INCLUDE(CMakeDetermineASMCompiler)
SET(ASM_DIALECT)
--- NEW FILE: SquishTestScript.cmake ---
#
# This script launches a GUI test using Squish. You should not call
# the script directly; instead, you should acces it via the
# SQUISH_ADD_TEST macro that is defined in FindSquish.cmake.
#
# This script starts the Squish server, launches the test on the
# client, and finally stops the squish server. If any of these steps
# fail (including if the tests do not pass) then a fatal error is
# raised.
#
cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
# print out the variable that we are using
message(STATUS "squish_aut='${squish_aut}'")
message(STATUS "squish_server_executable='${squish_server_executable}'")
message(STATUS "squish_client_executable='${squish_client_executable}'")
message(STATUS "squish_libqtdir ='${squish_libqtdir}'")
message(STATUS "squish_test_case='${squish_test_case}'")
message(STATUS "squish_wrapper='${squish_wrapper}'")
message(STATUS "squish_env_vars='${squish_env_vars}'")
# parse enviornment variables
foreach(i ${squish_env_vars})
message(STATUS "parsing env var key/value pair ${i}")
string(REGEX MATCH "([^=]*)=(.*)" squish_env_name ${i})
message(STATUS "key=${CMAKE_MATCH_1}")
message(STATUS "value=${CMAKE_MATCH_2}")
set ( ENV{${CMAKE_MATCH_1}} ${CMAKE_MATCH_2} )
endforeach()
if (QT4_INSTALLED)
# record qt lib directory
set ( ENV{${SQUISH_LIBQTDIR}} ${squish_libqtdir} )
endif (QT4_INSTALLED)
# run the test
if (WIN32)
execute_process(
COMMAND ${CMAKE_ROOT}/Modules/SquishRunTestCase.bat ${squish_server_executable} ${squish_client_executable} ${squish_test_case} ${squish_wrapper} ${squish_aut}
RESULT_VARIABLE test_rv
)
endif (WIN32)
if (UNIX)
execute_process(
COMMAND ${CMAKE_ROOT}/Modules/SquishRunTestCase.sh ${squish_server_executable} ${squish_client_executable} ${squish_test_case} ${squish_wrapper} ${squish_aut}
RESULT_VARIABLE test_rv
)
endif (UNIX)
# check for an error with running the test
if(NOT "${test_rv}" STREQUAL "0")
message(FATAL_ERROR "Error running Squish test")
endif(NOT "${test_rv}" STREQUAL "0")
Index: FindEXPAT.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindEXPAT.cmake,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** FindEXPAT.cmake 25 Nov 2007 13:20:05 -0000 1.4
--- FindEXPAT.cmake 31 Dec 2008 15:14:19 -0000 1.4.2.1
***************
*** 10,14 ****
# Look for the library.
! FIND_LIBRARY(EXPAT_LIBRARY NAMES expat)
# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
--- 10,14 ----
# Look for the library.
! FIND_LIBRARY(EXPAT_LIBRARY NAMES expat libexpat)
# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if
Index: FindLibXml2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLibXml2.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
*** FindLibXml2.cmake 3 Sep 2008 13:43:16 -0000 1.4.2.1
--- FindLibXml2.cmake 31 Dec 2008 15:14:19 -0000 1.4.2.2
***************
*** 22,39 ****
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
! INCLUDE(UsePkgConfig)
! PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
! SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
ENDIF (NOT WIN32)
FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
! PATHS
! ${_LibXml2IncDir}
PATH_SUFFIXES libxml2
)
FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
! PATHS
! ${_LibXml2LinkDir}
)
--- 22,41 ----
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
! FIND_PACKAGE(PkgConfig)
! PKG_CHECK_MODULES(PC_LIBXML libxml-2.0)
! SET(LIBXML2_DEFINITIONS ${PC_LIBXML_CFLAGS_OTHER})
ENDIF (NOT WIN32)
FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
! HINTS
! ${PC_LIBXML_INCLUDEDIR}
! ${PC_LIBXML_INCLUDE_DIRS}
PATH_SUFFIXES libxml2
)
FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
! HINTS
! ${PC_LIBXML_LIBDIR}
! ${PC_LIBXML_LIBRARY_DIRS}
)
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.17
retrieving revision 1.96.2.18
diff -C 2 -d -r1.96.2.17 -r1.96.2.18
*** FindQt4.cmake 2 Dec 2008 12:07:36 -0000 1.96.2.17
--- FindQt4.cmake 31 Dec 2008 15:14:19 -0000 1.96.2.18
***************
*** 200,206 ****
# QT_PHONON_INCLUDE_DIR Path to "include/phonon"
#
# QT_LIBRARY_DIR Path to "lib" of Qt4
- #
# QT_PLUGINS_DIR Path to "plugins" for Qt4
#
#
--- 200,209 ----
# QT_PHONON_INCLUDE_DIR Path to "include/phonon"
#
+ # QT_BINARY_DIR Path to "bin" of Qt4
# QT_LIBRARY_DIR Path to "lib" of Qt4
# QT_PLUGINS_DIR Path to "plugins" for Qt4
+ # QT_TRANSLATIONS_DIR Path to "translations" of Qt4
+ # QT_DOC_DIR Path to "doc" of Qt4
+ # QT_MKSPECS_DIR Path to "mkspecs" of Qt4
#
#
***************
*** 244,250 ****
# QT_LRELEASE_EXECUTABLE Where to find the lrelease tool.
#
- # QT_DOC_DIR Path to "doc" of Qt4
- # QT_MKSPECS_DIR Path to "mkspecs" of Qt4
- #
#
# These are around for backwards compatibility
--- 247,250 ----
***************
*** 474,477 ****
--- 474,488 ----
SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE)
ENDIF ((QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR) OR QT_QMAKE_CHANGED)
+
+ # ask qmake for the translations directory
+ IF ((QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR) OR QT_QMAKE_CHANGED)
+ EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+ ARGS "-query QT_INSTALL_TRANSLATIONS"
+ OUTPUT_VARIABLE qt_translations_dir )
+ # make sure we have / and not \ as qmake gives on windows
+ FILE(TO_CMAKE_PATH "${qt_translations_dir}" qt_translations_dir)
+ SET(QT_TRANSLATIONS_DIR ${qt_translations_dir} CACHE PATH "The location of the Qt translations" FORCE)
+ ENDIF ((QT_LIBRARY_DIR AND NOT QT_TRANSLATIONS_DIR) OR QT_QMAKE_CHANGED)
+
########################################
#
***************
*** 555,559 ****
# Make variables changeble to the advanced user
! MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR QT_PLUGINS_DIR)
# Set QT_INCLUDES
--- 566,571 ----
# Make variables changeble to the advanced user
! MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_DOC_DIR QT_MKSPECS_DIR
! QT_PLUGINS_DIR QT_TRANSLATIONS_DIR)
# Set QT_INCLUDES
Index: CPackRPM.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPackRPM.cmake,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -C 2 -d -r1.7.2.1 -r1.7.2.2
*** CPackRPM.cmake 22 Sep 2008 14:05:16 -0000 1.7.2.1
--- CPackRPM.cmake 31 Dec 2008 15:14:19 -0000 1.7.2.2
***************
*** 127,130 ****
--- 127,140 ----
ENDIF (NOT CPACK_RPM_PACKAGE_DESCRIPTION)
+ # CPACK_RPM_PACKAGE_REQUIRES
+ # Placeholder used to specify binary RPM dependencies (if any)
+ # see http://www.rpm.org/max-rpm/s1-rpm-depend-manual-dependencies.html
+ IF(CPACK_RPM_PACKAGE_REQUIRES)
+ IF(CPACK_RPM_PACKAGE_DEBUG)
+ MESSAGE("CPackRPM:Debug: User defined Requires:\n ${CPACK_RPM_PACKAGE_REQUIRES}")
+ ENDIF(CPACK_RPM_PACKAGE_DEBUG)
+ SET(TMP_RPM_REQUIRES "Requires: ${CPACK_RPM_PACKAGE_REQUIRES}")
+ ENDIF(CPACK_RPM_PACKAGE_REQUIRES)
+
# CPACK_RPM_SPEC_INSTALL_POST
# May be used to define a RPM post intallation script
***************
*** 132,135 ****
--- 142,148 ----
# rpmbuild from stripping binaries.
IF(CPACK_RPM_SPEC_INSTALL_POST)
+ IF(CPACK_RPM_PACKAGE_DEBUG)
+ MESSAGE("CPackRPM:Debug: User defined CPACK_RPM_SPEC_INSTALL_POST = ${CPACK_RPM_SPEC_INSTALL_POST}")
+ ENDIF(CPACK_RPM_PACKAGE_DEBUG)
SET(TMP_RPM_SPEC_INSTALL_POST "%define __spec_install_post ${CPACK_RPM_SPEC_INSTALL_POST}")
ENDIF(CPACK_RPM_SPEC_INSTALL_POST)
***************
*** 178,189 ****
MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_DIRECTORY = ${CPACK_TOPLEVEL_DIRECTORY}")
MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_TAG = ${CPACK_TOPLEVEL_TAG}")
! MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_DIRECTORY = ${PACK_TEMPORARY_DIRECTORY}")
MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_NAME = ${CPACK_OUTPUT_FILE_NAME}")
MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_PATH = ${CPACK_OUTPUT_FILE_PATH}")
MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_FILE_NAME = ${CPACK_PACKAGE_FILE_NAME}")
MESSAGE("CPackRPM:Debug: CPACK_RPM_BINARY_SPECFILE = ${CPACK_RPM_BINARY_SPECFILE}")
! MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_INSTALL_DIRECTORY = ${PACK_PACKAGE_INSTALL_DIRECTORY}")
MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
- MESSAGE("CPackRPM:Debug: CPACK_RPM_SPEC_INSTALL_POST = ${CPACK_RPM_SPEC_INSTALL_POST}")
ENDIF(CPACK_RPM_PACKAGE_DEBUG)
FILE(WRITE ${CPACK_RPM_BINARY_SPECFILE}
--- 191,201 ----
MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_DIRECTORY = ${CPACK_TOPLEVEL_DIRECTORY}")
MESSAGE("CPackRPM:Debug: CPACK_TOPLEVEL_TAG = ${CPACK_TOPLEVEL_TAG}")
! MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_DIRECTORY = ${CPACK_TEMPORARY_DIRECTORY}")
MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_NAME = ${CPACK_OUTPUT_FILE_NAME}")
MESSAGE("CPackRPM:Debug: CPACK_OUTPUT_FILE_PATH = ${CPACK_OUTPUT_FILE_PATH}")
MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_FILE_NAME = ${CPACK_PACKAGE_FILE_NAME}")
MESSAGE("CPackRPM:Debug: CPACK_RPM_BINARY_SPECFILE = ${CPACK_RPM_BINARY_SPECFILE}")
! MESSAGE("CPackRPM:Debug: CPACK_PACKAGE_INSTALL_DIRECTORY = ${CPACK_PACKAGE_INSTALL_DIRECTORY}")
MESSAGE("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}")
ENDIF(CPACK_RPM_PACKAGE_DEBUG)
FILE(WRITE ${CPACK_RPM_BINARY_SPECFILE}
***************
*** 197,200 ****
--- 209,213 ----
Group: ${CPACK_RPM_PACKAGE_GROUP}
Vendor: ${CPACK_RPM_PACKAGE_VENDOR}
+ ${TMP_RPM_REQUIRES}
${TMP_RPM_BUILDARCH}
***************
*** 229,232 ****
--- 242,248 ----
%changelog
+ * Mon Oct 03 2008 Erk <eric.noulard at gmail.com>
+ Update generator to handle optional dependencies using Requires
+ Update DEBUG output typos.
* Mon Aug 25 2008 Erk <eric.noulard at gmail.com>
Update generator to handle optional post-install
--- NEW FILE: CMakeTestASM_MASMCompiler.cmake ---
# This file is used by EnableLanguage in cmGlobalGenerator to
# determine that the selected ASM_MASM "compiler" (should be masm or masm64)
# can actually "compile" and link the most basic of programs. If not, a
# fatal error is set and cmake stops processing commands and will not generate
# any makefiles or projects.
SET(ASM_DIALECT "_MASM")
INCLUDE(CMakeTestASMCompiler)
SET(ASM_DIALECT)
Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.18.2.5
retrieving revision 1.18.2.6
diff -C 2 -d -r1.18.2.5 -r1.18.2.6
*** FindwxWidgets.cmake 24 Oct 2008 15:18:45 -0000 1.18.2.5
--- FindwxWidgets.cmake 31 Dec 2008 15:14:25 -0000 1.18.2.6
***************
*** 490,495 ****
IF(WX_LIB_DIR)
- SET(wxWidgets_FOUND TRUE)
-
# If building shared libs, define WXUSINGDLL to use dllimport.
IF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*")
--- 490,493 ----
***************
*** 510,513 ****
--- 508,513 ----
IF(WX_CONFIGURATION)
+ SET(wxWidgets_FOUND TRUE)
+
# If the selected configuration wasn't found force the default
# one. Otherwise, use it but still force a refresh for
--- NEW FILE: CMakeASM_MASMInformation.cmake ---
# support for the MS assembler, masm and masm64
SET(ASM_DIALECT "_MASM")
SET(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS asm)
SET(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT "<CMAKE_ASM${ASM_DIALECT}_COMPILER> <FLAGS> /c /Fo <OBJECT> <SOURCE>")
INCLUDE(CMakeASMInformation)
SET(ASM_DIALECT)
Index: FindDoxygen.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindDoxygen.cmake,v
retrieving revision 1.14
retrieving revision 1.14.12.1
diff -C 2 -d -r1.14 -r1.14.12.1
*** FindDoxygen.cmake 5 Dec 2006 00:37:29 -0000 1.14
--- FindDoxygen.cmake 31 Dec 2008 15:14:19 -0000 1.14.12.1
***************
*** 67,71 ****
FIND_PROGRAM(DOXYGEN_DOT_EXECUTABLE
NAMES dot
! PATHS "$ENV{ProgramFiles}/ATT/Graphviz/bin"
"C:/Program Files/ATT/Graphviz/bin"
[HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin
--- 67,73 ----
FIND_PROGRAM(DOXYGEN_DOT_EXECUTABLE
NAMES dot
! PATHS "$ENV{ProgramFiles}/Graphviz 2.21/bin"
! "C:/Program Files/Graphviz 2.21/bin"
! "$ENV{ProgramFiles}/ATT/Graphviz/bin"
"C:/Program Files/ATT/Graphviz/bin"
[HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin
--- NEW FILE: SquishRunTestCase.bat ---
echo 'Starting the squish server...'
start %1
echo 'Running the test case...'
%2 --testcase %3 --wrapper %4 --aut %5
set result=%ERRORLEVEL%
echo 'Stopping the squish server...'
%1 --stop
exit \b %result%
--- NEW FILE: SquishRunTestCase.sh ---
#!/bin/sh
echo "Starting the squish server...$1 --daemon"
$1 --daemon
echo "Running the test case...$2 --testcase $3 --wrapper $4 --aut $5"
$2 --testcase $3 --wrapper $4 --aut $5
returnValue=$?
echo "Stopping the squish server...$1 --stop"
$1 --stop
exit $returnValue
Index: GetPrerequisites.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/GetPrerequisites.cmake,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C 2 -d -r1.1.2.3 -r1.1.2.4
*** GetPrerequisites.cmake 11 Nov 2008 21:52:21 -0000 1.1.2.3
--- GetPrerequisites.cmake 31 Dec 2008 15:14:26 -0000 1.1.2.4
***************
*** 569,574 ****
endforeach(candidate)
! list(SORT ${prerequisites_var})
!
if(${recurse})
set(more_inputs ${unseen_prereqs})
--- 569,576 ----
endforeach(candidate)
! list(LENGTH ${prerequisites_var} prerequisites_var_length)
! if(prerequisites_var_length GREATER 0)
! list(SORT ${prerequisites_var})
! endif(prerequisites_var_length GREATER 0)
if(${recurse})
set(more_inputs ${unseen_prereqs})
More information about the Cmake-commits
mailing list