Commit 6dde1543 authored by Brad King's avatar Brad King

CMake 2.8.1-rc4

This commit cherry-picks and squashes the following commits:

  46858720 "FortranCInterface: Fix PathScale detection..." (2010-02-16)
  b39fe940 "Fix problem with ExternalProject test..." (2010-02-17)
  70290e1f "Add support for QtDeclartive module" (2010-02-17)
  282ba895 "Clarify CMAKE_MODULE_PATH documentation" (2010-02-18)
  4eba05de "Suppress GNU flag -fPIC on Windows" (2010-02-19)
  57efb4a4 "BUG: We shouldn't be setting the HideWindow..." (2010-02-19)
parent f195a131
Changes in CMake 2.8.1 RC 4
- CTest: Do not hide test GUI windows (fixes 2.8.0 regression)
- Documentation: Clarify CMAKE_MODULE_PATH variable
- FindQt4: Add support for QtDeclartive module
- FortranCInterface: Fix PathScale detection
- Suppress GNU flag -fPIC on Windows (fixes 2.8.1-rc1 regression)
Changes in CMake 2.8.1 RC 3
- Add CMAKE_XCODE_ATTRIBUTE_<attr> interface to set compiler (#9125)
- Fix Eclipse files for targets in subdirectories (#9978)
......
......@@ -51,6 +51,7 @@
# QT_USE_QTXMLPATTERNS
# QT_USE_PHONON
# QT_USE_QTSCRIPTTOOLS
# QT_USE_QTDECLARATIVE
#
# QT_USE_IMPORTED_TARGETS
# If this variable is set to TRUE, FindQt4.cmake will create imported
......@@ -186,6 +187,7 @@
# QT_QTXML_FOUND True if QtXml was found.
# QT_QTXMLPATTERNS_FOUND True if QtXmlPatterns was found.
# QT_PHONON_FOUND True if phonon was found.
# QT_QTDECLARATIVE_FOUND True if QtDeclarative was found.
#
# QT_MAC_USE_COCOA For Mac OS X, its whether Cocoa or Carbon is used.
# In general, this should not be used, but its useful
......@@ -234,7 +236,8 @@
# QT_QTXMLPATTERNS_INCLUDE_DIR Path to "include/QtXmlPatterns"
# QT_PHONON_INCLUDE_DIR Path to "include/phonon"
# QT_QTSCRIPTTOOLS_INCLUDE_DIR Path to "include/QtScriptTools"
#
# QT_QTDECLARATIVE_INCLUDE_DIR Path to "include/QtDeclarative"
#
# QT_BINARY_DIR Path to "bin" of Qt4
# QT_LIBRARY_DIR Path to "lib" of Qt4
# QT_PLUGINS_DIR Path to "plugins" for Qt4
......@@ -276,6 +279,8 @@
# QT_PHONON_LIBRARY The phonon library
# QT_QTSCRIPTTOOLS_LIBRARY The QtScriptTools library
#
# The QtDeclarative library: QT_QTDECLARATIVE_LIBRARY
#
# also defined, but NOT for general use are
# QT_MOC_EXECUTABLE Where to find the moc tool.
# QT_UIC_EXECUTABLE Where to find the uic tool.
......@@ -638,7 +643,8 @@ IF (QT4_QMAKE_FOUND)
SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools
QtHelp QtWebKit QtXmlPatterns phonon QtNetwork QtMultimedia
QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools)
QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus QtScriptTools
QtDeclarative)
IF(Q_WS_X11)
SET(QT_MODULES ${QT_MODULES} QtMotif)
......@@ -949,6 +955,7 @@ IF (QT4_QMAKE_FOUND)
_QT4_ADJUST_LIB_VARS(QtAssistantClient)
_QT4_ADJUST_LIB_VARS(QtCLucene)
_QT4_ADJUST_LIB_VARS(QtDBus)
_QT4_ADJUST_LIB_VARS(QtDeclarative)
_QT4_ADJUST_LIB_VARS(QtDesigner)
_QT4_ADJUST_LIB_VARS(QtDesignerComponents)
_QT4_ADJUST_LIB_VARS(QtHelp)
......
#if defined(__PATHSCALE__)
/* PathScale Fortran wants my_module_ when calling any my_module symbol,
but module symbols use '.in.' so we cannot provide them anyway. */
void pathscale_my_module_(void) {}
#else
/* PGI Fortran wants my_module_ when calling any my_module symbol. */
void my_module_(void) {}
#endif
......@@ -67,6 +67,8 @@ macro(__windows_compiler_gnu lang)
endforeach(type)
endif()
set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "") # No -fPIC on Windows
# Binary link rules.
set(CMAKE_${lang}_CREATE_SHARED_MODULE
"<CMAKE_${lang}_COMPILER> <CMAKE_SHARED_MODULE_${lang}_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS> -o <TARGET> ${CMAKE_GNULD_IMAGE_VERSION} <OBJECTS> <LINK_LIBRARIES>")
......
......@@ -63,10 +63,12 @@ SET(QT_QTXMLPATTERNS_MODULE_DEPENDS QTNETWORK QTCORE)
SET(QT_QAXCONTAINER_MODULE_DEPENDS QTGUI QTCORE)
SET(QT_QAXSERVER_MODULE_DEPENDS QTGUI QTCORE)
SET(QT_QTSCRIPTTOOLS_MODULE_DEPENDS QTGUI QTCORE)
SET(QT_QTWEBKIT_MODULE_DEPENDS QTXMLPATTERNS QTGUI QTCORE)
SET(QT_QTDECLARATIVE_MODULE_DEPENDS QTWEBKIT QTSCRIPT QTSVG QTSQL QTXMLPATTERNS QTXML QTOPENGL QTGUI QTNETWORK QTCORE)
# Qt modules (in order of dependence)
FOREACH(module QT3SUPPORT QTOPENGL QTASSISTANT QTDESIGNER QTMOTIF QTNSPLUGIN
QAXSERVER QAXCONTAINER QTSCRIPT QTSVG QTUITOOLS QTHELP
QAXSERVER QAXCONTAINER QTDECLARATIVE QTSCRIPT QTSVG QTUITOOLS QTHELP
QTWEBKIT PHONON QTSCRIPTTOOLS QTGUI QTTEST QTDBUS QTXML QTSQL
QTXMLPATTERNS QTNETWORK QTCORE)
......
......@@ -61,7 +61,6 @@ bool cmProcess::StartProcess()
cmsysProcess_SetWorkingDirectory(this->Process,
this->WorkingDirectory.c_str());
}
cmsysProcess_SetOption(this->Process, cmsysProcess_Option_HideWindow, 1);
cmsysProcess_SetTimeout(this->Process, this->Timeout);
cmsysProcess_Execute(this->Process);
return (cmsysProcess_GetState(this->Process)
......
......@@ -515,10 +515,10 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cm->DefineProperty
("CMAKE_MODULE_PATH", cmProperty::VARIABLE,
"Path to look for cmake modules to load.",
"Specifies a path to override the default search path for "
"CMake modules. For example include commands will look "
"in this path first for modules to include.",
"List of directories to search for CMake modules.",
"Commands like include() and find_package() search for files in "
"directories listed by this variable before checking the default "
"modules that come with CMake.",
false,
"Variables That Change Behavior");
......
......@@ -24,6 +24,17 @@ if(NOT DEFINED can_build_tutorial_step5)
set(can_build_tutorial_step5 0)
endif()
endif()
# The ExternalProject builds of Tutorial Step5 cannot be built
# correctly 2nd and later times in an in-source build...
# (because the CMakeCache.txt from the real in-source build of
# the Tests/Tutorial/Step5 directory gets copied when we do
# the "source directory copy" step... but it still refers to
# its original path which yields a configure error.) So:
#
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
set(can_build_tutorial_step5 0)
endif()
endif()
message(STATUS "can_build_tutorial_step5='${can_build_tutorial_step5}'")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment