[cmake-commits] hoffman committed CMakeGenericSystem.cmake 1.10.2.2
1.10.2.3 CPack.cmake 1.17.2.5 1.17.2.6 CTestTargets.cmake 1.1
1.1.6.1 FindDoxygen.cmake 1.7.2.1 1.7.2.2 FindJNI.cmake 1.25
1.25.2.1 FindJava.cmake 1.15 1.15.2.1 FindKDE3.cmake 1.3.2.1
1.3.2.2 FindPerl.cmake 1.8 1.8.2.1 FindQt4.cmake 1.25.2.7
1.25.2.8 FindTclsh.cmake 1.10 1.10.2.1 FindWish.cmake 1.6
1.6.2.1 FindwxWidgets.cmake 1.2.6.2 1.2.6.3 NSIS.template.in
1.11.2.5 1.11.2.6 UsewxWidgets.cmake 1.3.2.1 1.3.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Oct 27 16:01:48 EDT 2006
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv22632/Modules
Modified Files:
Tag: CMake-2-4
CMakeGenericSystem.cmake CPack.cmake CTestTargets.cmake
FindDoxygen.cmake FindJNI.cmake FindJava.cmake FindKDE3.cmake
FindPerl.cmake FindQt4.cmake FindTclsh.cmake FindWish.cmake
FindwxWidgets.cmake NSIS.template.in UsewxWidgets.cmake
Log Message:
ENH: move changes from main tree
Index: CMakeGenericSystem.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeGenericSystem.cmake,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -d -r1.10.2.2 -r1.10.2.3
--- CMakeGenericSystem.cmake 30 Jun 2006 17:48:42 -0000 1.10.2.2
+++ CMakeGenericSystem.cmake 27 Oct 2006 20:01:46 -0000 1.10.2.3
@@ -41,6 +41,14 @@
MARK_AS_ADVANCED(CMAKE_COLOR_MAKEFILE)
ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")
+# Set a variable to indicate whether the value of CMAKE_INSTALL_PREFIX
+# was initialized by the block below. This is useful for user
+# projects to change the default prefix while still allowing the
+# command line to override it.
+IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
+ SET(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT 1)
+ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
+
# Choose a default install prefix for this platform.
IF(UNIX)
SET(CMAKE_INSTALL_PREFIX "/usr/local"
Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -d -r1.11.2.5 -r1.11.2.6
--- NSIS.template.in 11 May 2006 02:15:08 -0000 1.11.2.5
+++ NSIS.template.in 27 Oct 2006 20:01:46 -0000 1.11.2.6
@@ -27,6 +27,16 @@
InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
;--------------------------------
+;General
+
+ ;Name and file
+ Name "@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+ OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
+
+ ;Set compression
+ SetCompressor @CPACK_NSIS_COMPRESSOR@
+
+;--------------------------------
; determine admin versus local install
; Is install for "AllUsers" or "JustMe"?
; Default to "JustMe" - set to "AllUsers" if admin or on Win9x
@@ -72,13 +82,6 @@
FunctionEnd
;--------------------------------
-;General
-
- ;Name and file
- Name "@CPACK_PACKAGE_INSTALL_DIRECTORY@"
- OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
-
-;--------------------------------
;Interface Settings
!define MUI_HEADERIMAGE
Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -u -d -r1.17.2.5 -r1.17.2.6
--- CPack.cmake 24 Jul 2006 15:19:34 -0000 1.17.2.5
+++ CPack.cmake 27 Oct 2006 20:01:46 -0000 1.17.2.6
@@ -56,6 +56,8 @@
cpack_set_if_not_set(CPACK_RESOURCE_FILE_WELCOME
"${CMAKE_ROOT}/Templates/CPack.GenericWelcome.txt")
+cpack_set_if_not_set(CPACK_MODULE_PATH "${CMAKE_MODULE_PATH}")
+
IF(CPACK_NSIS_MODIFY_PATH)
SET(CPACK_NSIS_MODIFY_PATH ON)
ENDIF(CPACK_NSIS_MODIFY_PATH)
Index: FindPerl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPerl.cmake,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- FindPerl.cmake 15 Dec 2005 19:17:42 -0000 1.8
+++ FindPerl.cmake 27 Oct 2006 20:01:46 -0000 1.8.2.1
@@ -27,3 +27,7 @@
SET (PERL ${PERL_EXECUTABLE})
ENDIF (NOT PERL_EXECUTABLE)
+
+IF (NOT PERL_FOUND AND Perl_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find Perl")
+ENDIF (NOT PERL_FOUND AND Perl_FIND_REQUIRED)
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.25.2.7
retrieving revision 1.25.2.8
diff -u -d -r1.25.2.7 -r1.25.2.8
--- FindQt4.cmake 13 Oct 2006 14:52:01 -0000 1.25.2.7
+++ FindQt4.cmake 27 Oct 2006 20:01:46 -0000 1.25.2.8
@@ -76,6 +76,8 @@
#
# QT_LIBRARY_DIR Path to "lib" of Qt4
#
+# QT_PLUGINS_DIR Path to "plugins" for Qt4
+#
# For every library of Qt there are three variables:
# QT_QTFOO_LIBRARY_RELEASE, which contains the full path to the release version
# QT_QTFOO_LIBRARY_DEBUG, which contains the full path to the debug version
@@ -317,6 +319,13 @@
SET(QT_MKSPECS_DIR ${qt_mkspecs_dir} CACHE PATH "The location of the Qt mkspecs")
ENDIF (NOT QT_MKSPECS_DIR)
+ # ask qmake for the plugins directory
+ IF (NOT QT_PLUGINS_DIR)
+ EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
+ ARGS "-query QT_INSTALL_PLUGINS"
+ OUTPUT_VARIABLE qt_plugins_dir )
+ SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins")
+ ENDIF (NOT QT_PLUGINS_DIR)
########################################
#
# Setting the INCLUDE-Variables
Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -u -d -r1.25 -r1.25.2.1
--- FindJNI.cmake 15 Dec 2005 15:41:19 -0000 1.25
+++ FindJNI.cmake 27 Oct 2006 20:01:46 -0000 1.25.2.1
@@ -17,9 +17,15 @@
/usr/local/lib
/usr/lib/java/jre/lib/i386
/usr/local/lib/java/jre/lib/i386
+ /usr/local/share/java/jre/lib/i386
/usr/lib/j2sdk1.4-sun/jre/lib/i386
/usr/lib/j2sdk1.5-sun/jre/lib/i386
/opt/sun-jdk-1.5.0.04/jre/lib/amd64
+ /usr/lib/java/jre/lib/amd64
+ /usr/local/lib/java/jre/lib/amd64
+ /usr/local/share/java/jre/lib/amd64
+ /usr/lib/j2sdk1.4-sun/jre/lib/amd64
+ /usr/lib/j2sdk1.5-sun/jre/lib/amd64
)
SET(JAVA_AWT_INCLUDE_DIRECTORIES
@@ -30,6 +36,7 @@
/usr/local/include
/usr/lib/java/include
/usr/local/lib/java/include
+ /usr/local/share/java/include
/usr/lib/j2sdk1.4-sun/include
/usr/lib/j2sdk1.5-sun/include
/opt/sun-jdk-1.5.0.04/include
@@ -53,26 +60,20 @@
ENDFOREACH(JAVA_PROG)
IF(APPLE)
- IF(EXISTS ~/Library/Frameworks/JavaEmbedding.framework)
- SET(JAVA_HAVE_FRAMEWORK 1)
- ENDIF(EXISTS ~/Library/Frameworks/JavaEmbedding.framework)
- IF(EXISTS /Library/Frameworks/JavaEmbedding.framework)
+ IF(EXISTS ~/Library/Frameworks/JavaVM.framework)
SET(JAVA_HAVE_FRAMEWORK 1)
- ENDIF(EXISTS /Library/Frameworks/JavaEmbedding.framework)
- IF(EXISTS /System/Library/Frameworks/JavaEmbedding.framework)
+ ENDIF(EXISTS ~/Library/Frameworks/JavaVM.framework)
+ IF(EXISTS /Library/Frameworks/JavaVM.framework)
SET(JAVA_HAVE_FRAMEWORK 1)
- ENDIF(EXISTS /System/Library/Frameworks/JavaEmbedding.framework)
+ ENDIF(EXISTS /Library/Frameworks/JavaVM.framework)
IF(JAVA_HAVE_FRAMEWORK)
IF(NOT JAVA_AWT_LIBRARY)
- SET (JAVA_AWT_LIBRARY "-framework JavaVM -framework JavaEmbedding" CACHE FILEPATH "Java Frameworks" FORCE)
+ SET (JAVA_AWT_LIBRARY "-framework JavaVM" CACHE FILEPATH "Java Frameworks" FORCE)
ENDIF(NOT JAVA_AWT_LIBRARY)
SET(JAVA_AWT_INCLUDE_DIRECTORIES ${JAVA_AWT_INCLUDE_DIRECTORIES}
~/Library/Frameworks/JavaVM.framework/Headers
/Library/Frameworks/JavaVM.framework/Headers
/System/Library/Frameworks/JavaVM.framework/Headers
- ~/Library/Frameworks/JavaEmbedding.framework/Headers
- /Library/Frameworks/JavaEmbedding.framework/Headers
- /System/Library/Frameworks/JavaEmbedding.framework/Headers
)
ENDIF(JAVA_HAVE_FRAMEWORK)
ELSE(APPLE)
Index: FindWish.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindWish.cmake,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- FindWish.cmake 15 Dec 2005 19:17:43 -0000 1.6
+++ FindWish.cmake 27 Oct 2006 20:01:46 -0000 1.6.2.1
@@ -19,8 +19,4 @@
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin
)
-IF (WIN32)
- MARK_AS_ADVANCED(
- TK_WISH
- )
-ENDIF(WIN32)
+MARK_AS_ADVANCED(TK_WISH )
Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.2.6.2
retrieving revision 1.2.6.3
diff -u -d -r1.2.6.2 -r1.2.6.3
--- FindwxWidgets.cmake 13 Oct 2006 14:52:01 -0000 1.2.6.2
+++ FindwxWidgets.cmake 27 Oct 2006 20:01:46 -0000 1.2.6.3
@@ -17,9 +17,6 @@
# FIND_PACKAGE(wxWidgets REQUIRED
# <components>)
#
-# HAVE_ISYSTEM - if true wx warnings are suppressed on g++
-# by replacing -I with -isystem
-#
# The following are set after configuration is done:
#
# wxWidgets_FOUND - Set to TRUE if wxWidgets was found.
@@ -117,7 +114,7 @@
jpeg
html
media
- msw msw26 msw27 msw28
+ msw msw28 msw27 msw26
mono
net
odbc
@@ -215,6 +212,8 @@
# Find wxWidgets multilib base libraries
FIND_LIBRARY(WX_base${_DBG}
NAMES
+ wxbase28${_UCD}${_DBG}
+ wxbase27${_UCD}${_DBG}
wxbase26${_UCD}${_DBG}
wxbase25${_UCD}${_DBG}
PATHS ${WX_LIB_DIR}
@@ -224,6 +223,8 @@
FOREACH(LIB net odbc xml)
FIND_LIBRARY(WX_${LIB}${_DBG}
NAMES
+ wxbase28${_UCD}${_DBG}_${LIB}
+ wxbase27${_UCD}${_DBG}_${LIB}
wxbase26${_UCD}${_DBG}_${LIB}
wxbase25${_UCD}${_DBG}_${LIB}
PATHS ${WX_LIB_DIR}
@@ -235,6 +236,8 @@
# Find wxWidgets monolithic library
FIND_LIBRARY(WX_mono${_DBG}
NAMES
+ wxmsw${_UNV}28${_UCD}${_DBG}
+ wxmsw${_UNV}27${_UCD}${_DBG}
wxmsw${_UNV}26${_UCD}${_DBG}
wxmsw${_UNV}25${_UCD}${_DBG}
PATHS ${WX_LIB_DIR}
@@ -246,6 +249,8 @@
FOREACH(LIB core adv html media xrc dbgrid gl qa)
FIND_LIBRARY(WX_${LIB}${_DBG}
NAMES
+ wxmsw${_UNV}28${_UCD}${_DBG}_${LIB}
+ wxmsw${_UNV}27${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}26${_UCD}${_DBG}_${LIB}
wxmsw${_UNV}25${_UCD}${_DBG}_${LIB}
PATHS ${WX_LIB_DIR}
@@ -357,27 +362,35 @@
#
# Look for an installation tree.
#
- FIND_PATH(wxWidgets_ROOT_DIR include/wx/wx.h
+ FIND_PATH(wxWidgets_ROOT_DIR
+ NAMES include/wx/wx.h
+ PATHS
+ $ENV{wxWidgets_ROOT_DIR}
$ENV{WXWIN}
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]" ## WX 2.6.x
- C:/wxWidgets-2.6.3
- D:/wxWidgets-2.6.3
- C:/wxWidgets-2.6.2
- D:/wxWidgets-2.6.2
- C:/wxWidgets-2.6.1
- D:/wxWidgets-2.6.1
- C:/wxWidgets-2.6.0
- D:/wxWidgets-2.6.0
- C:/wxWidgets-2.5.5
- D:/wxWidgets-2.5.5
- C:/wxWidgets-2.5.4
- D:/wxWidgets-2.5.4
- C:/wxWidgets-2.5.3
- D:/wxWidgets-2.5.3
- C:/wxWidgets-2.5.2
- D:/wxWidgets-2.5.2
- C:/wxWidgets-2.5.1
- D:/wxWidgets-2.5.1
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]" # WX 2.6.x
+ C:/
+ D:/
+ $ENV{ProgramFiles}
+ PATH_SUFFIXES
+ wxWidgets-2.8.4
+ wxWidgets-2.8.3
+ wxWidgets-2.8.2
+ wxWidgets-2.8.1
+ wxWidgets-2.8.0
+ wxWidgets-2.7.4
+ wxWidgets-2.7.3
+ wxWidgets-2.7.2
+ wxWidgest-2.7.1
+ wxWidgets-2.7.0
+ wxWidgets-2.7.0-1
+ wxWidgets-2.6.3
+ wxWidgets-2.6.2
+ wxWidgets-2.6.1
+ wxWidgets-2.5.4
+ wxWidgets-2.5.3
+ wxWidgets-2.5.2
+ wxWidgets-2.5.1
+ wxWidgets
DOC "wxWidgets base/installation directory?"
)
@@ -556,21 +569,6 @@
# convert space to semicolons for list
STRING(REGEX REPLACE " " ";" wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}")
- # drop -I* from CXXFLAGS - postponed until -isystem is available to INCLUDE_DIRECTORIES to avoid pedantic warnings
- #STRING(REGEX REPLACE "-I[^ ;]*" "" wxWidgets_CXX_FLAGS ${wxWidgets_CXX_FLAGS})
-
- IF (HAVE_ISYSTEM) # does the compiler support -isystem ?
- IF (NOT APPLE) # -isystem seem unsuppored on Mac
- IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX )
- IF (CMAKE_CXX_COMPILER MATCHES g\\+\\+) # just to be sure
- # handle WX include dirs as system directories - ignores pedantic warnings with gcc
- # replace -I by -isystem
- STRING(REGEX REPLACE "-I" "-isystem" wxWidgets_CXX_FLAGS ${wxWidgets_CXX_FLAGS})
- ENDIF(CMAKE_CXX_COMPILER MATCHES g\\+\\+)
- ENDIF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX )
- ENDIF(NOT APPLE)
- ENDIF(HAVE_ISYSTEM)
-
ELSE(RET EQUAL 0)
DBG_MSG("${wxWidgets_CONFIG_EXECUTABLE} --cxxflags FAILED with RET=${RET}")
SET(wxWidgets_FOUND FALSE)
Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- FindKDE3.cmake 13 Oct 2006 14:52:01 -0000 1.3.2.1
+++ FindKDE3.cmake 27 Oct 2006 20:01:46 -0000 1.3.2.2
@@ -83,16 +83,22 @@
#only on linux, but NOT e.g. on FreeBSD:
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
SET (KDE3_DEFINITIONS ${KDE3_DEFINITIONS} -D_XOPEN_SOURCE=500 -D_BSD_SOURCE)
- SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-common")
- SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -fno-exceptions -fno-check-new -fno-common")
+ SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+ SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-exceptions -fno-check-new -fno-common")
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
# works on FreeBSD, NOT tested on NetBSD and OpenBSD
IF (CMAKE_SYSTEM_NAME MATCHES BSD)
- SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-common")
- SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+ SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+ SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
ENDIF (CMAKE_SYSTEM_NAME MATCHES BSD)
+# if no special buildtype is selected, add -O2 as default optimization
+IF (NOT CMAKE_BUILD_TYPE)
+ SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
+ SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+ENDIF (NOT CMAKE_BUILD_TYPE)
+
#SET(CMAKE_SHARED_LINKER_FLAGS "-avoid-version -module -Wl,--no-undefined -Wl,--allow-shlib-undefined")
#SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
Index: CTestTargets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTestTargets.cmake,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- CTestTargets.cmake 3 Aug 2005 17:19:36 -0000 1.1
+++ CTestTargets.cmake 27 Oct 2006 20:01:46 -0000 1.1.6.1
@@ -29,16 +29,22 @@
# These should NOT need to be modified from project to project.
#
+SET(__conf_types "")
+IF(CMAKE_CONFIGURATION_TYPES)
+ # We need to pass the configuration type on the test command line.
+ SET(__conf_types -C "${CMAKE_CFG_INTDIR}")
+ENDIF(CMAKE_CONFIGURATION_TYPES)
+
# add testing targets
IF(${CMAKE_MAKE_PROGRAM} MATCHES make)
FOREACH(mode Experimental Nightly Continuous NightlyMemoryCheck)
- ADD_CUSTOM_TARGET(${mode} ${CMAKE_CTEST_COMMAND} -D ${mode})
+ ADD_CUSTOM_TARGET(${mode} ${CMAKE_CTEST_COMMAND} ${__conf_types} -D ${mode})
ENDFOREACH(mode)
ELSE(${CMAKE_MAKE_PROGRAM} MATCHES make)
# for IDE only add them once for nested projects
IF (NOT DART_COMMON_TARGETS_ADDED)
FOREACH(mode Experimental Nightly Continuous NightlyMemoryCheck)
- ADD_CUSTOM_TARGET(${mode} ${CMAKE_CTEST_COMMAND} -D ${mode})
+ ADD_CUSTOM_TARGET(${mode} ${CMAKE_CTEST_COMMAND} ${__conf_types} -D ${mode})
ENDFOREACH(mode)
SET (DART_COMMON_TARGETS_ADDED 1)
ENDIF (NOT DART_COMMON_TARGETS_ADDED)
@@ -53,7 +59,7 @@
FOREACH(testtype Start Update Configure Build Test Coverage MemCheck Submit)
# missing purify
ADD_CUSTOM_TARGET(${mode}${testtype}
- ${CMAKE_CTEST_COMMAND} -D ${mode}${testtype})
+ ${CMAKE_CTEST_COMMAND} ${__conf_types} -D ${mode}${testtype})
ENDFOREACH(testtype)
ENDFOREACH(mode)
ENDIF (${CMAKE_MAKE_PROGRAM} MATCHES make)
Index: FindDoxygen.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindDoxygen.cmake,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- FindDoxygen.cmake 13 Oct 2006 14:52:01 -0000 1.7.2.1
+++ FindDoxygen.cmake 27 Oct 2006 20:01:46 -0000 1.7.2.2
@@ -1,9 +1,28 @@
-# - This module looks for Doxygen and the path to Graphiz's dot
+# - This module looks for Doxygen and the path to Graphviz's dot
# Doxygen is a documentation generation tool see http://www.doxygen.org
# With the OS X GUI version, it likes to be installed to /Applications and
# it contains the doxygen executable in the bundle. In the versions I've
# seen, it is located in Resources, but in general, more often binaries are
-# located in MacOS.
+# located in MacOS. This code sets the following variables:
+# DOXYGEN_EXECUTABLE = The path to the doxygen command.
+# DOXYGEN_DOT_EXECUTABLE = The path to the dot program used by doxygen.
+# DOXYGEN_DOT_PATH = The path to dot not including the executable
+# DOXYGEN = same as DOXYGEN_EXECUTABLE for backwards compatibility
+# DOT = same as DOXYGEN_DOT_EXECUTABLE for backwards compatibility
+
+# The official Doxygen.app that is distributed for OS X uses non-standard
+# conventions. Instead of the command-line "doxygen" tool being placed in
+# Doxygen.app/Contents/MacOS, "Doxywizard" is placed there instead and
+# "doxygen" is actually placed in Contents/Resources. This is most likely
+# to accomodate people who double-click on the Doxygen.app package and expect
+# to see something happen. However, the CMake backend gets horribly confused
+# by this. Once CMake sees the bundle, it indiscrimately uses Doxywizard
+# as the executable to use. The only work-around I have found is to disable
+# the app-bundle feature for only this command.
+# Save the old setting
+SET(TEMP_DOXYGEN_SAVE_CMAKE_FIND_APPBUNDLE ${CMAKE_FIND_APPBUNDLE})
+# Disable the App-bundle detection feature
+SET(CMAKE_FIND_APPBUNDLE "NEVER")
IF (NOT DOXYGEN_FIND_QUIETLY)
MESSAGE(STATUS "Looking for doxygen...")
ENDIF (NOT DOXYGEN_FIND_QUIETLY)
@@ -46,34 +65,31 @@
/Applications/Graphviz.app/Contents/MacOS
/Applications/Doxygen.app/Contents/Resources
/Applications/Doxygen.app/Contents/MacOS
- DOC "Graphiz Dot tool for using Doxygen"
+ DOC "Graphviz Dot tool for using Doxygen"
)
IF (NOT DOXYGEN_FIND_QUIETLY)
IF (DOXYGEN_DOT_EXECUTABLE)
MESSAGE(STATUS "Looking for dot tool... - found ${DOXYGEN_DOT_EXECUTABLE}")
+ # The Doxyfile wants the path to Dot, not the entire path and executable
+ GET_FILENAME_COMPONENT(DOXYGEN_DOT_PATH "${DOXYGEN_DOT_EXECUTABLE}" PATH CACHE)
ELSE (DOXYGEN_DOT_EXECUTABLE)
MESSAGE(STATUS "Looking for dot tool... - NOT found")
ENDIF (DOXYGEN_DOT_EXECUTABLE)
ENDIF (NOT DOXYGEN_FIND_QUIETLY)
-# The Doxyfile wants the path to Dot, not the entire path and executable
-# so for convenience, I'll add another search for DOXYGEN_DOT_PATH.
-FIND_PATH(DOXYGEN_DOT_PATH
- dot
- "C:/Program Files/ATT/Graphviz/bin"
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\ATT\\Graphviz;InstallPath]/bin
- /Applications/Graphviz.app/Contents/MacOS
- /Applications/Doxygen.app/Contents/Resources
- /Applications/Doxygen.app/Contents/MacOS
- DOC "Path to the Graphviz Dot tool"
-)
+# Restore the old app-bundle setting setting
+SET(CMAKE_FIND_APPBUNDLE ${TEMP_DOXYGEN_SAVE_CMAKE_FIND_APPBUNDLE})
+
+# Backwards compatibility for CMake4.3 and less
+SET (DOXYGEN ${DOXYGEN_EXECUTABLE} )
+SET (DOT ${DOXYGEN_DOT_EXECUTABLE} )
MARK_AS_ADVANCED(
- DOXYGEN_FOUND,
- DOXYGEN_EXECUTABLE,
- DOXYGEN_DOT_FOUND,
- DOXYGEN_DOT_EXECUTABLE,
- DOXYGEN_DOT_PATH,
+ DOXYGEN_FOUND
+ DOXYGEN_EXECUTABLE
+ DOXYGEN_DOT_FOUND
+ DOXYGEN_DOT_EXECUTABLE
+ DOXYGEN_DOT_PATH
)
Index: UsewxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UsewxWidgets.cmake,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- UsewxWidgets.cmake 24 Jul 2006 15:19:34 -0000 1.3.2.1
+++ UsewxWidgets.cmake 27 Oct 2006 20:01:46 -0000 1.3.2.2
@@ -32,7 +32,11 @@
MSG("wxWidgets_FOUND=${wxWidgets_FOUND}")
IF (wxWidgets_FOUND)
IF (wxWidgets_INCLUDE_DIRS)
- INCLUDE_DIRECTORIES( ${wxWidgets_INCLUDE_DIRS} )
+ IF(wxWidgets_INCLUDE_DIRS_NO_SYSTEM)
+ INCLUDE_DIRECTORIES(${wxWidgets_INCLUDE_DIRS})
+ ELSE(wxWidgets_INCLUDE_DIRS_NO_SYSTEM)
+ INCLUDE_DIRECTORIES(SYSTEM ${wxWidgets_INCLUDE_DIRS})
+ ENDIF(wxWidgets_INCLUDE_DIRS_NO_SYSTEM)
MSG("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}")
ENDIF(wxWidgets_INCLUDE_DIRS)
Index: FindJava.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJava.cmake,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -d -r1.15 -r1.15.2.1
--- FindJava.cmake 15 Dec 2005 15:41:19 -0000 1.15
+++ FindJava.cmake 27 Oct 2006 20:01:46 -0000 1.15.2.1
@@ -22,6 +22,7 @@
/usr/share/java/bin
/usr/local/bin
/usr/local/java/bin
+ /usr/local/java/share/bin
/usr/java/j2sdk1.4.2_04
/usr/lib/j2sdk1.4-sun/bin
/usr/java/j2sdk1.4.2_09/bin
Index: FindTclsh.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTclsh.cmake,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- FindTclsh.cmake 15 Dec 2005 19:17:43 -0000 1.10
+++ FindTclsh.cmake 27 Oct 2006 20:01:46 -0000 1.10.2.1
@@ -32,8 +32,4 @@
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin
)
-IF (WIN32)
- MARK_AS_ADVANCED(
- TCL_TCLSH
- )
-ENDIF(WIN32)
+MARK_AS_ADVANCED( TCL_TCLSH )
More information about the Cmake-commits
mailing list