diff options
| -rw-r--r-- | Modules/FeatureSummary.cmake | 14 | ||||
| -rw-r--r-- | Modules/FindPackageHandleStandardArgs.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindPythonLibs.cmake | 7 | ||||
| -rw-r--r-- | Modules/FindQt4.cmake | 4 | ||||
| -rw-r--r-- | Source/cmInstallGenerator.cxx | 7 | ||||
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/kwsys/kwsysDateStamp.cmake | 2 |
7 files changed, 27 insertions, 11 deletions
diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake index 594e2e7..f7bfe27 100644 --- a/Modules/FeatureSummary.cmake +++ b/Modules/FeatureSummary.cmake @@ -120,7 +120,7 @@ FUNCTION(ADD_FEATURE_INFO _name _enabled _desc) ENDIF () SET_PROPERTY(GLOBAL PROPERTY _CMAKE_${_name}_DESCRIPTION "${_desc}" ) -ENDFUNCTION(SET_FEATURE_INFO) +ENDFUNCTION(ADD_FEATURE_INFO) FUNCTION(SET_FEATURE_INFO) @@ -199,21 +199,25 @@ FUNCTION(FEATURE_SUMMARY) OR "${_FS_WHAT}" STREQUAL "PACKAGES_FOUND" OR "${_FS_WHAT}" STREQUAL "PACKAGES_NOT_FOUND") _FS_GET_FEATURE_SUMMARY( ${_FS_WHAT} _featureSummary) + SET(_fullText "${_FS_DESCRIPTION}${_featureSummary}\n") ELSEIF("${_FS_WHAT}" STREQUAL "ALL") _FS_GET_FEATURE_SUMMARY( PACKAGES_FOUND _tmp1) _FS_GET_FEATURE_SUMMARY( PACKAGES_NOT_FOUND _tmp2) SET(_featureSummary "${_tmp1}${_tmp2}") + IF(_FS_DESCRIPTION) + SET(_fullText "${_FS_DESCRIPTION}${_tmp1}${_tmp2}\n") + ELSE(_FS_DESCRIPTION) + SET(_fullText "-- Found the following packages:${_tmp1}\n-- Did not find the following packages:${_tmp2}\n") + ENDIF(_FS_DESCRIPTION) ELSE() MESSAGE(FATAL_ERROR "The WHAT argument of FEATURE_SUMMARY() is set to ${_FS_WHAT}, which is not a valid value.") ENDIF() - SET(_fullText "${_FS_DESCRIPTION}${_featureSummary}\n") - IF(_FS_FILENAME) IF(_FS_APPEND) - FILE(WRITE "${_FS_FILENAME}" "${_fullText}") - ELSE(_FS_APPEND) FILE(APPEND "${_FS_FILENAME}" "${_fullText}") + ELSE(_FS_APPEND) + FILE(WRITE "${_FS_FILENAME}" "${_fullText}") ENDIF(_FS_APPEND) ELSE(_FS_FILENAME) diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake index cd33aa3..1acb021 100644 --- a/Modules/FindPackageHandleStandardArgs.cmake +++ b/Modules/FindPackageHandleStandardArgs.cmake @@ -232,7 +232,7 @@ FUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG) ENDIF (${_NAME}_FIND_VERSION) IF(VERSION_OK) - SET(DETAILS "${DETAILS}[v${VERSION}]") + SET(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]") ELSE(VERSION_OK) SET(${_NAME_UPPER}_FOUND FALSE) ENDIF(VERSION_OK) diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index d12f14a..283c914 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -128,6 +128,13 @@ FUNCTION(PYTHON_ADD_MODULE _NAME ) ADD_LIBRARY(${_NAME} ${PY_MODULE_TYPE} ${ARGN}) # TARGET_LINK_LIBRARIES(${_NAME} ${PYTHON_LIBRARIES}) + IF(PYTHON_MODULE_${_NAME}_BUILD_SHARED) + SET_TARGET_PROPERTIES(${_NAME} PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}") + IF(WIN32 AND NOT CYGWIN) + SET_TARGET_PROPERTIES(${_NAME} PROPERTIES SUFFIX ".pyd") + ENDIF(WIN32 AND NOT CYGWIN) + ENDIF(PYTHON_MODULE_${_NAME}_BUILD_SHARED) + ENDIF(PYTHON_ENABLE_MODULE_${_NAME}) ENDFUNCTION(PYTHON_ADD_MODULE) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 0a36710..d2d39e6 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -602,10 +602,12 @@ IF (QT4_QMAKE_FOUND) FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE NAMES QtCore${QT_LIBINFIX} QtCore${QT_LIBINFIX}4 HINTS ${QT_LIBRARY_DIR_TMP} + NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH ) FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG NAMES QtCore${QT_LIBINFIX}_debug QtCore${QT_LIBINFIX}d QtCore${QT_LIBINFIX}d4 HINTS ${QT_LIBRARY_DIR_TMP} + NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH ) # try dropping a hint if trying to use Visual Studio with Qt built by mingw @@ -630,7 +632,7 @@ IF (QT4_QMAKE_FOUND) SET(QT_QTCORE_FOUND 1) ELSE() MESSAGE("Warning: QT_QMAKE_EXECUTABLE reported QT_INSTALL_LIBS as ${QT_LIBRARY_DIR_TMP}") - MESSAGE("Warning: But QtCore couldn't be found. Qt must NOT be installed correctly.") + MESSAGE("Warning: But QtCore couldn't be found. Qt must NOT be installed correctly, or it wasn't found for cross compiling.") 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) diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx index 9d5e416..d7505dc 100644 --- a/Source/cmInstallGenerator.cxx +++ b/Source/cmInstallGenerator.cxx @@ -67,8 +67,11 @@ void cmInstallGenerator for(std::vector<std::string>::const_iterator fi = files.begin(); fi != files.end(); ++fi) { - if (fi!=files.begin()) os << ";"; - os << dest << cmSystemTools::ConvertToOutputPath("/"); + if (fi!=files.begin()) + { + os << ";"; + } + os << dest << "/"; if (rename && *rename) { os << rename; diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index b290aed..8dfafff 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -767,7 +767,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags( hasFlags = true; this->WriteString("<ObjectFileName>", 3); (*this->BuildFileStream ) - << "$(Configuration)/" << objectName << "</ObjectFileName>\n"; + << "$(IntDir)/" << objectName << "</ObjectFileName>\n"; } std::vector<std::string> *configs = static_cast<cmGlobalVisualStudio7Generator *> diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 7694753..98fc895 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2010) SET(KWSYS_DATE_STAMP_MONTH 09) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 23) +SET(KWSYS_DATE_STAMP_DAY 28) |