[Cmake-commits] [cmake-commits] hoffman committed CMakeCCompilerABI.c 1.1 1.1.2.1 CMakeCCompilerId.c.in 1.3 1.3.2.1 CMakeCXXCompilerABI.cpp 1.1 1.1.2.1 CMakeCXXCompilerId.cpp.in 1.2 1.2.2.1 CheckTypeSizeC.c.in 1.3 1.3.4.1 FindKDE3.cmake 1.10.2.3 1.10.2.4 FindKDE4.cmake 1.10.2.4 1.10.2.5 FindLibXml2.cmake 1.4 1.4.2.1 FindLua50.cmake 1.3.2.1 1.3.2.2 FindLua51.cmake 1.3.2.1 1.3.2.2 FindOpenGL.cmake 1.40 1.40.2.1 FindPHP4.cmake 1.6 1.6.2.1 FindPNG.cmake 1.17 1.17.2.1 FindQt3.cmake 1.16.4.2 1.16.4.3 FindQt4.cmake 1.96.2.13 1.96.2.14 FindTIFF.cmake 1.11 1.11.2.1 FindX11.cmake 1.31.2.2 1.31.2.3 MacOSXFrameworkInfo.plist.in NONE 1.3.2.2 NSIS.template.in 1.25.2.3 1.25.2.4 TestEndianess.c.in 1.1 1.1.2.1 UsePkgConfig.cmake 1.6 1.6.12.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Sep 3 09:43:18 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv18450/Modules
Modified Files:
Tag: CMake-2-6
CMakeCCompilerABI.c CMakeCCompilerId.c.in
CMakeCXXCompilerABI.cpp CMakeCXXCompilerId.cpp.in
CheckTypeSizeC.c.in FindKDE3.cmake FindKDE4.cmake
FindLibXml2.cmake FindLua50.cmake FindLua51.cmake
FindOpenGL.cmake FindPHP4.cmake FindPNG.cmake FindQt3.cmake
FindQt4.cmake FindTIFF.cmake FindX11.cmake NSIS.template.in
TestEndianess.c.in UsePkgConfig.cmake
Added Files:
Tag: CMake-2-6
MacOSXFrameworkInfo.plist.in
Log Message:
ENH: 2.6.2 rc 2 merge from main tree
Index: FindPHP4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPHP4.cmake,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C 2 -d -r1.6 -r1.6.2.1
*** FindPHP4.cmake 19 Jul 2007 13:42:57 -0000 1.6
--- FindPHP4.cmake 3 Sep 2008 13:43:16 -0000 1.6.2.1
***************
*** 69,70 ****
--- 69,72 ----
ENDIF(APPLE)
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PHP4 DEFAULT_MSG PHP4_EXECUTABLE PHP4_INCLUDE_PATH)
Index: FindPNG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPNG.cmake,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C 2 -d -r1.17 -r1.17.2.1
*** FindPNG.cmake 23 Jul 2007 13:49:52 -0000 1.17
--- FindPNG.cmake 3 Sep 2008 13:43:16 -0000 1.17.2.1
***************
*** 17,21 ****
)
! SET(PNG_NAMES ${PNG_NAMES} png libpng)
FIND_LIBRARY(PNG_LIBRARY NAMES ${PNG_NAMES} )
--- 17,21 ----
)
! SET(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12)
FIND_LIBRARY(PNG_LIBRARY NAMES ${PNG_NAMES} )
Index: UsePkgConfig.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UsePkgConfig.cmake,v
retrieving revision 1.6
retrieving revision 1.6.12.1
diff -C 2 -d -r1.6 -r1.6.12.1
*** UsePkgConfig.cmake 7 Mar 2007 20:36:09 -0000 1.6
--- UsePkgConfig.cmake 3 Sep 2008 13:43:16 -0000 1.6.12.1
***************
*** 13,20 ****
! FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config PATHS /usr/local/bin )
MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
! message(STATUS
"WARNING: you are using the obsolete 'PKGCONFIG' macro use FindPkgConfig")
# reset the variables at the beginning
--- 13,20 ----
! FIND_PROGRAM(PKGCONFIG_EXECUTABLE NAMES pkg-config )
MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
! MESSAGE(STATUS
"WARNING: you are using the obsolete 'PKGCONFIG' macro use FindPkgConfig")
# reset the variables at the beginning
***************
*** 34,51 ****
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir
OUTPUT_VARIABLE ${_include_DIR} )
! string(REGEX REPLACE "[\r\n]" " " ${_include_DIR} "${${_include_DIR}}")
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir
OUTPUT_VARIABLE ${_link_DIR} )
! string(REGEX REPLACE "[\r\n]" " " ${_link_DIR} "${${_link_DIR}}")
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs
OUTPUT_VARIABLE ${_link_FLAGS} )
! string(REGEX REPLACE "[\r\n]" " " ${_link_FLAGS} "${${_link_FLAGS}}")
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags
OUTPUT_VARIABLE ${_cflags} )
! string(REGEX REPLACE "[\r\n]" " " ${_cflags} "${${_cflags}}")
ENDIF(NOT _return_VALUE)
--- 34,55 ----
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=includedir
OUTPUT_VARIABLE ${_include_DIR} )
! STRING(REGEX REPLACE "[\r\n]" " " ${_include_DIR} "${${_include_DIR}}")
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --variable=libdir
OUTPUT_VARIABLE ${_link_DIR} )
! STRING(REGEX REPLACE "[\r\n]" " " ${_link_DIR} "${${_link_DIR}}")
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --libs
OUTPUT_VARIABLE ${_link_FLAGS} )
! STRING(REGEX REPLACE "[\r\n]" " " ${_link_FLAGS} "${${_link_FLAGS}}")
EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --cflags
OUTPUT_VARIABLE ${_cflags} )
! STRING(REGEX REPLACE "[\r\n]" " " ${_cflags} "${${_cflags}}")
!
! ELSE( NOT _return_VALUE)
!
! MESSAGE(STATUS "PKGCONFIG() indicates that ${_package} is not installed (install the package which contains ${_package}.pc if you want to support this feature)")
ENDIF(NOT _return_VALUE)
Index: FindLua51.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLua51.cmake,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C 2 -d -r1.3.2.1 -r1.3.2.2
*** FindLua51.cmake 13 Jun 2008 12:55:15 -0000 1.3.2.1
--- FindLua51.cmake 3 Sep 2008 13:43:16 -0000 1.3.2.2
***************
*** 1,6 ****
# Locate Lua library
# This module defines
# LUA_LIBRARIES
- # LUA_FOUND, if false, do not try to link to Lua
# LUA_INCLUDE_DIR, where to find lua.h
#
--- 1,6 ----
# Locate Lua library
# This module defines
+ # LUA51_FOUND, if false, do not try to link to Lua
# LUA_LIBRARIES
# LUA_INCLUDE_DIR, where to find lua.h
#
Index: CheckTypeSizeC.c.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckTypeSizeC.c.in,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C 2 -d -r1.3 -r1.3.4.1
*** CheckTypeSizeC.c.in 5 Jun 2007 14:20:21 -0000 1.3
--- CheckTypeSizeC.c.in 3 Sep 2008 13:43:16 -0000 1.3.4.1
***************
*** 30,42 ****
']','\0'};
-
#ifdef __CLASSIC_C__
! int main(){
! int ac;
! char*av[];
#else
! int main(int ac, char*av[]){
#endif
! return (&info_sizeof[0] != &info_sizeof[0]);
}
--- 30,43 ----
']','\0'};
#ifdef __CLASSIC_C__
! int main(argc, argv) int argc; char *argv[];
#else
! int main(int argc, char *argv[])
#endif
! {
! int require = 0;
! require += info_sizeof[argc];
! (void)argv;
! return require;
}
Index: FindLua50.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLua50.cmake,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C 2 -d -r1.3.2.1 -r1.3.2.2
*** FindLua50.cmake 13 Jun 2008 12:55:15 -0000 1.3.2.1
--- FindLua50.cmake 3 Sep 2008 13:43:16 -0000 1.3.2.2
***************
*** 1,6 ****
# Locate Lua library
# This module defines
# LUA_LIBRARIES, both lua and lualib
- # LUA_FOUND, if false, do not try to link to Lua
# LUA_INCLUDE_DIR, where to find lua.h and lualib.h (and probably lauxlib.h)
#
--- 1,6 ----
# Locate Lua library
# This module defines
+ # LUA50_FOUND, if false, do not try to link to Lua
# LUA_LIBRARIES, both lua and lualib
# LUA_INCLUDE_DIR, where to find lua.h and lualib.h (and probably lauxlib.h)
#
Index: FindLibXml2.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLibXml2.cmake,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** FindLibXml2.cmake 23 Jul 2007 13:49:52 -0000 1.4
--- FindLibXml2.cmake 3 Sep 2008 13:43:16 -0000 1.4.2.1
***************
*** 2,9 ****
# Once done this will define
#
! # LIBXML2_FOUND - system has LibXml2
! # LIBXML2_INCLUDE_DIR - the LibXml2 include directory
! # LIBXML2_LIBRARIES - the libraries needed to use LibXml2
# LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
--- 2,10 ----
# Once done this will define
#
! # LIBXML2_FOUND - System has LibXml2
! # LIBXML2_INCLUDE_DIR - The LibXml2 include directory
! # LIBXML2_LIBRARIES - The libraries needed to use LibXml2
# LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
+ # LIBXML2_XMLLINT_EXECUTABLE - The XML checking tool xmllint coming with LibXml2
# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
***************
*** 37,40 ****
--- 38,45 ----
)
+ FIND_PROGRAM(LIBXML2_XMLLINT_EXECUTABLE xmllint)
+ # for backwards compat. with KDE 4.0.x:
+ SET(XMLLINT_EXECUTABLE "${LIBXML2_XMLLINT_EXECUTABLE}")
+
INCLUDE(FindPackageHandleStandardArgs)
***************
*** 43,46 ****
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
! MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
--- 48,51 ----
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
! MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES LIBXML2_XMLLINT_EXECUTABLE)
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.13
retrieving revision 1.96.2.14
diff -C 2 -d -r1.96.2.13 -r1.96.2.14
*** FindQt4.cmake 13 Jul 2008 21:55:23 -0000 1.96.2.13
--- FindQt4.cmake 3 Sep 2008 13:43:16 -0000 1.96.2.14
***************
*** 49,54 ****
# macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
# create moc code from a list of files containing Qt class with
! # the Q_OBJECT declaration. Options may be given to moc, such as those found
! # when executing "moc -help"
#
# macro QT4_WRAP_UI(outfiles inputfile ... OPTIONS ...)
--- 49,55 ----
# macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
# create moc code from a list of files containing Qt class with
! # the Q_OBJECT declaration. Per-direcotry preprocessor definitions
! # are also added. Options may be given to moc, such as those found
! # when executing "moc -help".
#
# macro QT4_WRAP_UI(outfiles inputfile ... OPTIONS ...)
***************
*** 103,111 ****
# the suffix .xml appended.
#
! # macro QT4_CREATE_TRANSLATION( qm_files sources ... ts_files ... )
# out: qm_files
! # in: sources ts_files
# generates commands to create .ts (vie lupdate) and .qm
! # (via lrelease) - files from sources. The ts files are
# created and/or updated in the source tree (unless given with full paths).
# The qm files are generated in the build tree.
--- 104,112 ----
# the suffix .xml appended.
#
! # macro QT4_CREATE_TRANSLATION( qm_files directories ... sources ... ts_files ... )
# out: qm_files
! # in: directories sources ts_files
# generates commands to create .ts (vie lupdate) and .qm
! # (via lrelease) - files from directories and/or sources. The ts files are
# created and/or updated in the source tree (unless given with full paths).
# The qm files are generated in the build tree.
***************
*** 257,260 ****
--- 258,274 ----
# QT_QT_LIBRARY Qt-Library is now split
+ # If Qt3 has already been found, fail.
+ IF(QT_QT_LIBRARY)
+ IF(Qt4_FIND_REQUIRED)
+ MESSAGE( FATAL_ERROR "Qt3 and Qt4 cannot be used together in one project.")
+ ELSE(Qt4_FIND_REQUIRED)
+ IF(NOT Qt4_FIND_QUIETLY)
+ MESSAGE( STATUS "Qt3 and Qt4 cannot be used together in one project.")
+ ENDIF(NOT Qt4_FIND_QUIETLY)
+ RETURN()
+ ENDIF(Qt4_FIND_REQUIRED)
+ ENDIF(QT_QT_LIBRARY)
+
+
INCLUDE(CheckSymbolExists)
INCLUDE(MacroAddFileDependencies)
***************
*** 475,481 ****
IF( NOT QT_INCLUDE_DIR)
! IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
MESSAGE( FATAL_ERROR "Could NOT find QtGlobal header")
! ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
ENDIF( NOT QT_INCLUDE_DIR)
--- 489,495 ----
IF( NOT QT_INCLUDE_DIR)
! IF(Qt4_FIND_REQUIRED)
MESSAGE( FATAL_ERROR "Could NOT find QtGlobal header")
! ENDIF(Qt4_FIND_REQUIRED)
ENDIF( NOT QT_INCLUDE_DIR)
***************
*** 513,520 ****
#############################################
- IF (QT_USE_FRAMEWORKS)
- SET(QT_DEFINITIONS ${QT_DEFINITIONS} -F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} )
- ENDIF (QT_USE_FRAMEWORKS)
-
# Set QT_QT3SUPPORT_INCLUDE_DIR
FIND_PATH(QT_QT3SUPPORT_INCLUDE_DIR Qt3Support
--- 527,530 ----
***************
*** 772,778 ****
ENDIF(QT_LIBRARY_DIR AND MSVC)
! IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
! ENDIF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED)
ENDIF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
--- 782,788 ----
ENDIF(QT_LIBRARY_DIR AND MSVC)
! IF(Qt4_FIND_REQUIRED)
MESSAGE( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
! ENDIF(Qt4_FIND_REQUIRED)
ENDIF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
***************
*** 1029,1044 ****
ENDMACRO (QT4_MAKE_OUTPUT_FILE )
! MACRO (QT4_GET_MOC_INC_DIRS _moc_INC_DIRS)
! SET(${_moc_INC_DIRS})
GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
FOREACH(_current ${_inc_DIRS})
! SET(${_moc_INC_DIRS} ${${_moc_INC_DIRS}} "-I" ${_current})
ENDFOREACH(_current ${_inc_DIRS})
! ENDMACRO(QT4_GET_MOC_INC_DIRS)
# helper macro to set up a moc rule
! MACRO (QT4_CREATE_MOC_COMMAND infile outfile moc_includes moc_options)
# For Windows, create a parameters file to work around command line length limit
IF (WIN32)
--- 1039,1063 ----
ENDMACRO (QT4_MAKE_OUTPUT_FILE )
! MACRO (QT4_GET_MOC_FLAGS _moc_flags)
! SET(${_moc_flags})
GET_DIRECTORY_PROPERTY(_inc_DIRS INCLUDE_DIRECTORIES)
FOREACH(_current ${_inc_DIRS})
! SET(${_moc_flags} ${${_moc_flags}} "-I${_current}")
ENDFOREACH(_current ${_inc_DIRS})
+
+ GET_DIRECTORY_PROPERTY(_defines COMPILE_DEFINITIONS)
+ FOREACH(_current ${_defines})
+ SET(${_moc_flags} ${${_moc_flags}} "-D${_current}")
+ ENDFOREACH(_current ${_defines})
! IF(Q_WS_WIN)
! SET(${_moc_flags} ${${_moc_flags}} -DWIN32)
! ENDIF(Q_WS_WIN)
!
! ENDMACRO(QT4_GET_MOC_FLAGS)
# helper macro to set up a moc rule
! MACRO (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
# For Windows, create a parameters file to work around command line length limit
IF (WIN32)
***************
*** 1054,1058 ****
ENDIF(_moc_outfile_dir)
SET (_moc_parameters_file ${outfile}_parameters)
! SET (_moc_parameters ${moc_includes} ${moc_options} -o "${outfile}" "${infile}")
FILE (REMOVE ${_moc_parameters_file})
FOREACH(arg ${_moc_parameters})
--- 1073,1077 ----
ENDIF(_moc_outfile_dir)
SET (_moc_parameters_file ${outfile}_parameters)
! SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}")
FILE (REMOVE ${_moc_parameters_file})
FOREACH(arg ${_moc_parameters})
***************
*** 1067,1071 ****
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_MOC_EXECUTABLE}
! ARGS ${moc_includes} ${moc_options} -o ${outfile} ${infile}
DEPENDS ${infile})
ENDIF (WIN32)
--- 1086,1090 ----
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_MOC_EXECUTABLE}
! ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile}
DEPENDS ${infile})
ENDIF (WIN32)
***************
*** 1074,1080 ****
MACRO (QT4_GENERATE_MOC infile outfile )
! QT4_GET_MOC_INC_DIRS(moc_includes)
GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
! QT4_CREATE_MOC_COMMAND(${abs_infile} ${outfile} "${moc_includes}" "")
SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file
ENDMACRO (QT4_GENERATE_MOC)
--- 1093,1099 ----
MACRO (QT4_GENERATE_MOC infile outfile )
! QT4_GET_MOC_FLAGS(moc_flags)
GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
! QT4_CREATE_MOC_COMMAND(${abs_infile} ${outfile} "${moc_flags}" "")
SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file
ENDMACRO (QT4_GENERATE_MOC)
***************
*** 1085,1089 ****
MACRO (QT4_WRAP_CPP outfiles )
# get include dirs
! QT4_GET_MOC_INC_DIRS(moc_includes)
QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
--- 1104,1108 ----
MACRO (QT4_WRAP_CPP outfiles )
# get include dirs
! QT4_GET_MOC_FLAGS(moc_flags)
QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
***************
*** 1091,1095 ****
GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
QT4_MAKE_OUTPUT_FILE(${it} moc_ cxx outfile)
! QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_includes}" "${moc_options}")
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH(it)
--- 1110,1114 ----
GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
QT4_MAKE_OUTPUT_FILE(${it} moc_ cxx outfile)
! QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH(it)
***************
*** 1235,1239 ****
MACRO(QT4_AUTOMOC)
! QT4_GET_MOC_INC_DIRS(_moc_INCS)
SET(_matching_FILES )
--- 1254,1258 ----
MACRO(QT4_AUTOMOC)
! QT4_GET_MOC_FLAGS(_moc_INCS)
SET(_matching_FILES )
Index: TestEndianess.c.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/TestEndianess.c.in,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** TestEndianess.c.in 10 Aug 2007 17:14:00 -0000 1.1
--- TestEndianess.c.in 3 Sep 2008 13:43:16 -0000 1.1.2.1
***************
*** 11,20 ****
#ifdef __CLASSIC_C__
! int main(){
! int ac;
! char*av[];
#else
! int main(int ac, char*av[]){
#endif
! return (&info_little[0] != &info_big[0]);
}
--- 11,23 ----
#ifdef __CLASSIC_C__
! int main(argc, argv) int argc; char *argv[];
#else
! int main(int argc, char *argv[])
#endif
! {
! int require = 0;
! require += info_little[argc];
! require += info_big[argc];
! (void)argv;
! return require;
}
Index: FindOpenGL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenGL.cmake,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -C 2 -d -r1.40 -r1.40.2.1
*** FindOpenGL.cmake 10 Aug 2007 15:37:29 -0000 1.40
--- FindOpenGL.cmake 3 Sep 2008 13:43:16 -0000 1.40.2.1
***************
*** 58,62 ****
/usr/share/doc/NVIDIA_GLX-1.0/include
/usr/openwin/share/include
! /opt/graphics/OpenGL/include
)
--- 58,62 ----
/usr/share/doc/NVIDIA_GLX-1.0/include
/usr/openwin/share/include
! /opt/graphics/OpenGL/include /usr/X11R6/include
)
***************
*** 64,68 ****
/usr/share/doc/NVIDIA_GLX-1.0/include
/usr/openwin/share/include
! /opt/graphics/OpenGL/include
)
--- 64,68 ----
/usr/share/doc/NVIDIA_GLX-1.0/include
/usr/openwin/share/include
! /opt/graphics/OpenGL/include /usr/X11R6/include
)
***************
*** 71,75 ****
PATHS /opt/graphics/OpenGL/lib
/usr/openwin/lib
! /usr/shlib
)
--- 71,75 ----
PATHS /opt/graphics/OpenGL/lib
/usr/openwin/lib
! /usr/shlib /usr/X11R6/lib
)
***************
*** 95,99 ****
/opt/graphics/OpenGL/lib
/usr/openwin/lib
! /usr/shlib
)
--- 95,99 ----
/opt/graphics/OpenGL/lib
/usr/openwin/lib
! /usr/shlib /usr/X11R6/lib
)
--- NEW FILE: MacOSXFrameworkInfo.plist.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>${MACOSX_FRAMEWORK_NAME}</string>
<key>CFBundleIconFile</key>
<string>${MACOSX_FRAMEWORK_ICON_FILE}</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_FRAMEWORK_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${MACOSX_FRAMEWORK_BUNDLE_VERSION}</string>
<key>CFBundleShortVersionString</key>
<string>${MACOSX_FRAMEWORK_SHORT_VERSION_STRING}</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
</plist>
Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -C 2 -d -r1.25.2.3 -r1.25.2.4
*** NSIS.template.in 13 Jul 2008 21:55:23 -0000 1.25.2.3
--- NSIS.template.in 3 Sep 2008 13:43:16 -0000 1.25.2.4
***************
*** 534,542 ****
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
!
;--------------------------------
;Languages
!
! !insertmacro MUI_LANGUAGE "English"
;--------------------------------
--- 534,593 ----
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
!
;--------------------------------
;Languages
!
! !insertmacro MUI_LANGUAGE "English" ;first language is the default language
! !insertmacro MUI_LANGUAGE "Albanian"
! !insertmacro MUI_LANGUAGE "Arabic"
! !insertmacro MUI_LANGUAGE "Basque"
! !insertmacro MUI_LANGUAGE "Belarusian"
! !insertmacro MUI_LANGUAGE "Bosnian"
! !insertmacro MUI_LANGUAGE "Breton"
! !insertmacro MUI_LANGUAGE "Bulgarian"
! !insertmacro MUI_LANGUAGE "Croatian"
! !insertmacro MUI_LANGUAGE "Czech"
! !insertmacro MUI_LANGUAGE "Danish"
! !insertmacro MUI_LANGUAGE "Dutch"
! !insertmacro MUI_LANGUAGE "Estonian"
! !insertmacro MUI_LANGUAGE "Farsi"
! !insertmacro MUI_LANGUAGE "Finnish"
! !insertmacro MUI_LANGUAGE "French"
! !insertmacro MUI_LANGUAGE "German"
! !insertmacro MUI_LANGUAGE "Greek"
! !insertmacro MUI_LANGUAGE "Hebrew"
! !insertmacro MUI_LANGUAGE "Hungarian"
! !insertmacro MUI_LANGUAGE "Icelandic"
! !insertmacro MUI_LANGUAGE "Indonesian"
! !insertmacro MUI_LANGUAGE "Irish"
! !insertmacro MUI_LANGUAGE "Italian"
! !insertmacro MUI_LANGUAGE "Japanese"
! !insertmacro MUI_LANGUAGE "Korean"
! !insertmacro MUI_LANGUAGE "Kurdish"
! !insertmacro MUI_LANGUAGE "Latvian"
! !insertmacro MUI_LANGUAGE "Lithuanian"
! !insertmacro MUI_LANGUAGE "Luxembourgish"
! !insertmacro MUI_LANGUAGE "Macedonian"
! !insertmacro MUI_LANGUAGE "Malay"
! !insertmacro MUI_LANGUAGE "Mongolian"
! !insertmacro MUI_LANGUAGE "Norwegian"
! !insertmacro MUI_LANGUAGE "Polish"
! !insertmacro MUI_LANGUAGE "Portuguese"
! !insertmacro MUI_LANGUAGE "PortugueseBR"
! !insertmacro MUI_LANGUAGE "Romanian"
! !insertmacro MUI_LANGUAGE "Russian"
! !insertmacro MUI_LANGUAGE "Serbian"
! !insertmacro MUI_LANGUAGE "SerbianLatin"
! !insertmacro MUI_LANGUAGE "SimpChinese"
! !insertmacro MUI_LANGUAGE "Slovak"
! !insertmacro MUI_LANGUAGE "Slovenian"
! !insertmacro MUI_LANGUAGE "Spanish"
! !insertmacro MUI_LANGUAGE "Swedish"
! !insertmacro MUI_LANGUAGE "Thai"
! !insertmacro MUI_LANGUAGE "TradChinese"
! !insertmacro MUI_LANGUAGE "Turkish"
! !insertmacro MUI_LANGUAGE "Ukrainian"
! !insertmacro MUI_LANGUAGE "Welsh"
!
;--------------------------------
Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -C 2 -d -r1.10.2.4 -r1.10.2.5
*** FindKDE4.cmake 30 Jun 2008 20:10:27 -0000 1.10.2.4
--- FindKDE4.cmake 3 Sep 2008 13:43:16 -0000 1.10.2.5
***************
*** 10,13 ****
--- 10,25 ----
# Author: Alexander Neundorf <neundorf at kde.org>
+ # If Qt3 has already been found, fail.
+ IF(QT_QT_LIBRARY)
+ IF(KDE4_FIND_REQUIRED)
+ MESSAGE( FATAL_ERROR "KDE4/Qt4 and Qt3 cannot be used together in one project.")
+ ELSE(KDE4_FIND_REQUIRED)
+ IF(NOT KDE4_FIND_QUIETLY)
+ MESSAGE( STATUS "KDE4/Qt4 and Qt3 cannot be used together in one project.")
+ ENDIF(NOT KDE_FIND_QUIETLY)
+ RETURN()
+ ENDIF(KDE4_FIND_REQUIRED)
+ ENDIF(QT_QT_LIBRARY)
+
FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
Index: CMakeCXXCompilerABI.cpp
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXCompilerABI.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** CMakeCXXCompilerABI.cpp 21 Jan 2008 23:30:17 -0000 1.1
--- CMakeCXXCompilerABI.cpp 3 Sep 2008 13:43:16 -0000 1.1.2.1
***************
*** 9,24 ****
/*--------------------------------------------------------------------------*/
! /* Make sure the information strings are referenced. */
! #define REQUIRE(x) (&x[0] != &require)
!
! int main()
{
! const char require = 0;
! return
! (
! REQUIRE(info_sizeof_dptr)
#if defined(ABI_ID)
! && REQUIRE(info_abi)
#endif
! );
}
--- 9,20 ----
/*--------------------------------------------------------------------------*/
! int main(int argc, char* argv[])
{
! int require = 0;
! require += info_sizeof_dptr[argc];
#if defined(ABI_ID)
! require += info_abi[argc];
#endif
! (void)argv;
! return require;
}
Index: FindTIFF.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTIFF.cmake,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C 2 -d -r1.11 -r1.11.2.1
*** FindTIFF.cmake 23 Jul 2007 13:49:52 -0000 1.11
--- FindTIFF.cmake 3 Sep 2008 13:43:16 -0000 1.11.2.1
***************
*** 10,14 ****
FIND_PATH(TIFF_INCLUDE_DIR tiff.h)
! SET(TIFF_NAMES ${TIFF_NAMES} tiff)
FIND_LIBRARY(TIFF_LIBRARY NAMES ${TIFF_NAMES} )
--- 10,14 ----
FIND_PATH(TIFF_INCLUDE_DIR tiff.h)
! SET(TIFF_NAMES ${TIFF_NAMES} tiff libtiff libtiff3)
FIND_LIBRARY(TIFF_LIBRARY NAMES ${TIFF_NAMES} )
***************
*** 16,22 ****
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(TIFF DEFAULT_MSG TIFF_LIBRARY TIFF_INCLUDE_DIR)
IF(TIFF_FOUND)
SET( TIFF_LIBRARIES ${TIFF_LIBRARY} )
ENDIF(TIFF_FOUND)
--- 16,24 ----
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
! FIND_PACKAGE_HANDLE_STANDARD_ARGS(TIFF DEFAULT_MSG TIFF_LIBRARY TIFF_INCLUDE_DIR)
IF(TIFF_FOUND)
SET( TIFF_LIBRARIES ${TIFF_LIBRARY} )
ENDIF(TIFF_FOUND)
+
+ MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY)
Index: FindX11.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindX11.cmake,v
retrieving revision 1.31.2.2
retrieving revision 1.31.2.3
diff -C 2 -d -r1.31.2.2 -r1.31.2.3
*** FindX11.cmake 4 May 2008 22:07:27 -0000 1.31.2.2
--- FindX11.cmake 3 Sep 2008 13:43:16 -0000 1.31.2.3
***************
*** 47,56 ****
/usr/pkg/xorg/include
/usr/X11R6/include
! /usr/local/include
/usr/include/X11
/usr/openwin/include
/usr/openwin/share/include
/opt/graphics/OpenGL/include
- /usr/include
)
--- 47,55 ----
/usr/pkg/xorg/include
/usr/X11R6/include
! /usr/X11R7/include
/usr/include/X11
/usr/openwin/include
/usr/openwin/share/include
/opt/graphics/OpenGL/include
)
***************
*** 58,64 ****
/usr/pkg/xorg/lib
/usr/X11R6/lib
! /usr/local/lib
/usr/openwin/lib
- /usr/lib
)
--- 57,62 ----
/usr/pkg/xorg/lib
/usr/X11R6/lib
! /usr/X11R7/lib
/usr/openwin/lib
)
Index: CMakeCCompilerId.c.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCCompilerId.c.in,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** CMakeCCompilerId.c.in 10 Mar 2008 13:32:25 -0000 1.3
--- CMakeCCompilerId.c.in 3 Sep 2008 13:43:16 -0000 1.3.2.1
***************
*** 3,15 ****
#endif
- /* Provide main() so the program can link. */
#if defined(__18CXX)
# define ID_VOID_MAIN
#endif
- #ifdef ID_VOID_MAIN
- void main() {}
- #else
- int main() { return 0; }
- #endif
#if defined(__INTEL_COMPILER) || defined(__ICC)
--- 3,9 ----
***************
*** 83,84 ****
--- 77,93 ----
@CMAKE_C_COMPILER_ID_PLATFORM_CONTENT@
+
+ /*--------------------------------------------------------------------------*/
+
+ #ifdef ID_VOID_MAIN
+ void main() {}
+ #else
+ int main(int argc, char* argv[])
+ {
+ int require = 0;
+ require += info_compiler[argc];
+ require += info_platform[argc];
+ (void)argv;
+ return require;
+ }
+ #endif
Index: FindQt3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt3.cmake,v
retrieving revision 1.16.4.2
retrieving revision 1.16.4.3
diff -C 2 -d -r1.16.4.2 -r1.16.4.3
*** FindQt3.cmake 25 Jun 2008 13:51:32 -0000 1.16.4.2
--- FindQt3.cmake 3 Sep 2008 13:43:16 -0000 1.16.4.3
***************
*** 21,24 ****
--- 21,37 ----
# QT_WRAP_UI set true if QT_UIC_EXECUTABLE is found
+ # If Qt4 has already been found, fail.
+ IF(QT4_FOUND)
+ IF(Qt3_FIND_REQUIRED)
+ MESSAGE( FATAL_ERROR "Qt3 and Qt4 cannot be used together in one project.")
+ ELSE(Qt3_FIND_REQUIRED)
+ IF(NOT Qt3_FIND_QUIETLY)
+ MESSAGE( STATUS "Qt3 and Qt4 cannot be used together in one project.")
+ ENDIF(NOT Qt3_FIND_QUIETLY)
+ RETURN()
+ ENDIF(Qt3_FIND_REQUIRED)
+ ENDIF(QT4_FOUND)
+
+
FILE(GLOB GLOB_PATHS_BIN /usr/lib/qt-3*/bin/)
FIND_PATH(QT_INCLUDE_DIR qt.h
***************
*** 35,39 ****
C:/Progra~1/qt/include
/usr/include/qt3
- /usr/X11R6/include
)
--- 48,51 ----
***************
*** 41,45 ****
# QT_INCLUDE_DIR to NOTFOUND
IF(NOT EXISTS ${QT_INCLUDE_DIR}/qglobal.h)
! SET(QT_INCLUDE_DIR QT_INCLUDE_DIR-NOTFOUND CACHE PATH "path to qt3 include directory" FORCE)
ENDIF(NOT EXISTS ${QT_INCLUDE_DIR}/qglobal.h)
--- 53,57 ----
# QT_INCLUDE_DIR to NOTFOUND
IF(NOT EXISTS ${QT_INCLUDE_DIR}/qglobal.h)
! SET(QT_INCLUDE_DIR QT_INCLUDE_DIR-NOTFOUND CACHE PATH "path to Qt3 include directory" FORCE)
ENDIF(NOT EXISTS ${QT_INCLUDE_DIR}/qglobal.h)
***************
*** 53,57 ****
# version X.Y.Z, so we need to remove the dots from version
STRING(REGEX REPLACE "\\." "" qt_version_str_lib "${qt_version_str}")
- ELSE(QT_INCLUDE_DIR)
ENDIF(QT_INCLUDE_DIR)
--- 65,68 ----
***************
*** 74,78 ****
/usr/share/qt3/lib
C:/Progra~1/qt/lib
- /usr/X11R6/lib
)
--- 85,88 ----
***************
*** 95,106 ****
/usr/share/qt3/lib
C:/Progra~1/qt/lib
- /usr/X11R6/lib
)
ENDIF (QT_MT_REQUIRED)
- IF(QT_QT_LIBRARY)
- ELSE(QT_QT_LIBRARY)
- ENDIF(QT_QT_LIBRARY)
-
FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY
--- 105,111 ----
***************
*** 117,121 ****
/usr/share/qt3/lib
C:/Progra~1/qt/lib
- /usr/X11R6/lib
)
--- 122,125 ----
***************
*** 141,145 ****
IF(QT_MOC_EXECUTABLE)
SET ( QT_WRAP_CPP "YES")
- ELSE(QT_MOC_EXECUTABLE)
ENDIF(QT_MOC_EXECUTABLE)
--- 145,148 ----
***************
*** 163,167 ****
IF(QT_UIC_EXECUTABLE)
SET ( QT_WRAP_UI "YES")
- ELSE(QT_UIC_EXECUTABLE)
ENDIF(QT_UIC_EXECUTABLE)
--- 166,169 ----
***************
*** 195,199 ****
# req = "6.5.4", qt = "3.2.1"
! macro(error_message msg)
IF(QT3_REQUIRED)
MESSAGE( FATAL_ERROR ${msg})
--- 197,201 ----
# req = "6.5.4", qt = "3.2.1"
! MACRO(error_message msg)
IF(QT3_REQUIRED)
MESSAGE( FATAL_ERROR ${msg})
***************
*** 201,208 ****
MESSAGE( STATUS ${msg})
ENDIF(QT3_REQUIRED)
! endmacro(error_message)
IF (req_qt_major_vers GREATER qt_major_vers) # (6 > 3) ?
! error_message( "Qt major version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_major_vers GREATER qt_major_vers) # no
IF (req_qt_major_vers LESS qt_major_vers) # (6 < 3) ?
--- 203,210 ----
MESSAGE( STATUS ${msg})
ENDIF(QT3_REQUIRED)
! ENDMACRO(error_message)
IF (req_qt_major_vers GREATER qt_major_vers) # (6 > 3) ?
! ERROR_MESSAGE( "Qt major version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_major_vers GREATER qt_major_vers) # no
IF (req_qt_major_vers LESS qt_major_vers) # (6 < 3) ?
***************
*** 210,214 ****
ELSE (req_qt_major_vers LESS qt_major_vers) # ( 6==3) ?
IF (req_qt_minor_vers GREATER qt_minor_vers) # (5>2) ?
! error_message( "Qt minor version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_minor_vers GREATER qt_minor_vers) # no
IF (req_qt_minor_vers LESS qt_minor_vers) # (5<2) ?
--- 212,216 ----
ELSE (req_qt_major_vers LESS qt_major_vers) # ( 6==3) ?
IF (req_qt_minor_vers GREATER qt_minor_vers) # (5>2) ?
! ERROR_MESSAGE( "Qt minor version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_minor_vers GREATER qt_minor_vers) # no
IF (req_qt_minor_vers LESS qt_minor_vers) # (5<2) ?
***************
*** 216,220 ****
ELSE (req_qt_minor_vers LESS qt_minor_vers) # (5==2)
IF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
! error_message( "Qt patch level not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
--- 218,222 ----
ELSE (req_qt_minor_vers LESS qt_minor_vers) # (5==2)
IF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
! ERROR_MESSAGE( "Qt patch level not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
***************
*** 227,235 ****
# if the include a library are found then we have it
! IF(QT_INCLUDE_DIR)
! IF(QT_QT_LIBRARY)
! SET( QT_FOUND "YES" )
! ENDIF(QT_QT_LIBRARY)
! ENDIF(QT_INCLUDE_DIR)
IF(QT_FOUND)
--- 229,235 ----
# if the include a library are found then we have it
! IF(QT_INCLUDE_DIR AND QT_QT_LIBRARY)
! SET( QT_FOUND "YES" )
! ENDIF(QT_INCLUDE_DIR AND QT_QT_LIBRARY)
IF(QT_FOUND)
***************
*** 294,309 ****
SET(QT_WRAP_CPP FALSE)
! IF (QT_MOC_EXECUTABLE)
! IF(_QT_MOC_VERSION_3)
! SET ( QT_WRAP_CPP TRUE)
! ENDIF(_QT_MOC_VERSION_3)
! ENDIF (QT_MOC_EXECUTABLE)
SET(QT_WRAP_UI FALSE)
! IF (QT_UIC_EXECUTABLE)
! IF(_QT_UIC_VERSION_3)
! SET ( QT_WRAP_UI TRUE)
! ENDIF(_QT_UIC_VERSION_3)
! ENDIF (QT_UIC_EXECUTABLE)
MARK_AS_ADVANCED(
--- 294,305 ----
SET(QT_WRAP_CPP FALSE)
! IF (QT_MOC_EXECUTABLE AND _QT_MOC_VERSION_3)
! SET ( QT_WRAP_CPP TRUE)
! ENDIF (QT_MOC_EXECUTABLE AND _QT_MOC_VERSION_3)
SET(QT_WRAP_UI FALSE)
! IF (QT_UIC_EXECUTABLE AND _QT_UIC_VERSION_3)
! SET ( QT_WRAP_UI TRUE)
! ENDIF (QT_UIC_EXECUTABLE AND _QT_UIC_VERSION_3)
MARK_AS_ADVANCED(
Index: CMakeCXXCompilerId.cpp.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXCompilerId.cpp.in,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** CMakeCXXCompilerId.cpp.in 10 Mar 2008 13:32:25 -0000 1.2
--- CMakeCXXCompilerId.cpp.in 3 Sep 2008 13:43:16 -0000 1.2.2.1
***************
*** 6,12 ****
#endif
- /* Provide main() so the program can link. */
- int main() { return 0; }
-
#if defined(__COMO__)
# define COMPILER_ID "Comeau"
--- 6,9 ----
***************
*** 71,72 ****
--- 68,80 ----
@CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT@
+
+ /*--------------------------------------------------------------------------*/
+
+ int main(int argc, char* argv[])
+ {
+ int require = 0;
+ require += info_compiler[argc];
+ require += info_platform[argc];
+ (void)argv;
+ return require;
+ }
Index: CMakeCCompilerABI.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCCompilerABI.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** CMakeCCompilerABI.c 21 Jan 2008 23:30:17 -0000 1.1
--- CMakeCCompilerABI.c 3 Sep 2008 13:43:16 -0000 1.1.2.1
***************
*** 13,28 ****
/*--------------------------------------------------------------------------*/
! /* Make sure the information strings are referenced. */
! #define REQUIRE(x) (&x[0] != &require)
!
! int main()
{
! const char require = 0;
! return
! (
! REQUIRE(info_sizeof_dptr)
#if defined(ABI_ID)
! && REQUIRE(info_abi)
#endif
! );
}
--- 13,28 ----
/*--------------------------------------------------------------------------*/
! #ifdef __CLASSIC_C__
! int main(argc, argv) int argc; char *argv[];
! #else
! int main(int argc, char *argv[])
! #endif
{
! int require = 0;
! require += info_sizeof_dptr[argc];
#if defined(ABI_ID)
! require += info_abi[argc];
#endif
! (void)argv;
! return require;
}
Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -C 2 -d -r1.10.2.3 -r1.10.2.4
*** FindKDE3.cmake 6 Aug 2008 21:04:18 -0000 1.10.2.3
--- FindKDE3.cmake 3 Sep 2008 13:43:16 -0000 1.10.2.4
***************
*** 68,71 ****
--- 68,83 ----
ENDIF(NOT UNIX AND KDE3_FIND_REQUIRED)
+ # If Qt4 has already been found, fail.
+ IF(QT4_FOUND)
+ IF(KDE3_FIND_REQUIRED)
+ MESSAGE( FATAL_ERROR "KDE3/Qt3 and Qt4 cannot be used together in one project.")
+ ELSE(KDE3_FIND_REQUIRED)
+ IF(NOT KDE3_FIND_QUIETLY)
+ MESSAGE( STATUS "KDE3/Qt3 and Qt4 cannot be used together in one project.")
+ ENDIF(NOT KDE3_FIND_QUIETLY)
+ RETURN()
+ ENDIF(KDE3_FIND_REQUIRED)
+ ENDIF(QT4_FOUND)
+
SET(QT_MT_REQUIRED TRUE)
More information about the Cmake-commits
mailing list