diff -Nru cmake-3.0.2/Auxiliary/bash-completion/ctest cmake-3.2.2/Auxiliary/bash-completion/ctest --- cmake-3.0.2/Auxiliary/bash-completion/ctest 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/Auxiliary/bash-completion/ctest 2015-04-13 17:09:00.000000000 +0000 @@ -19,8 +19,12 @@ _filedir return ;; - -L|--label-regex|-LE|--label-exclude|--track|-I|--tests-information|\ - --max-width|--timeout|--stop-time) + -L|--label-regex|-LE|--label-exclude) + COMPREPLY=( $( compgen -W '$( ctest --print-labels 2>/dev/null | + grep "^ " 2>/dev/null | cut -d" " -f 3 )' -- "$cur" ) ) + return + ;; + --track|-I|--tests-information|--max-width|--timeout|--stop-time) # argument required but no completions available return ;; diff -Nru cmake-3.0.2/Auxiliary/cmake-indent.vim cmake-3.2.2/Auxiliary/cmake-indent.vim --- cmake-3.0.2/Auxiliary/cmake-indent.vim 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/Auxiliary/cmake-indent.vim 2015-04-13 17:09:00.000000000 +0000 @@ -16,7 +16,7 @@ " Version: $Revision$ " " Licence: The CMake license applies to this file. See -" http://www.cmake.org/HTML/Copyright.html +" http://www.cmake.org/licensing " This implies that distribution with Vim is allowed if exists("b:did_indent") diff -Nru cmake-3.0.2/Auxiliary/cmake-mode.el cmake-3.2.2/Auxiliary/cmake-mode.el --- cmake-3.0.2/Auxiliary/cmake-mode.el 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/Auxiliary/cmake-mode.el 2015-04-13 17:09:00.000000000 +0000 @@ -202,7 +202,7 @@ ;; Keyword highlighting regex-to-face map. ;; (defconst cmake-font-lock-keywords - (list '("^[ \t]*\\(\\w+\\)[ \t]*(" 1 font-lock-function-name-face)) + (list '("^[ \t]*\\([[:word:]_]+\\)[ \t]*(" 1 font-lock-function-name-face)) "Highlighting expressions for CMAKE mode." ) @@ -241,7 +241,6 @@ ; Create the syntax table (setq cmake-mode-syntax-table (make-syntax-table)) (set-syntax-table cmake-mode-syntax-table) - (modify-syntax-entry ?_ "w" cmake-mode-syntax-table) (modify-syntax-entry ?\( "()" cmake-mode-syntax-table) (modify-syntax-entry ?\) ")(" cmake-mode-syntax-table) (modify-syntax-entry ?# "<" cmake-mode-syntax-table) @@ -322,8 +321,13 @@ ) (require 'thingatpt) +(defun cmake-symbol-at-point () + (let ((symbol (symbol-at-point))) + (and (not (null symbol)) + (symbol-name symbol)))) + (defun cmake-help-type (type) - (let* ((default-entry (word-at-point)) + (let* ((default-entry (cmake-symbol-at-point)) (history (car (cdr (cdr (assoc type cmake-string-to-list-symbol))))) (input (completing-read (format "CMake %s: " type) ; prompt @@ -366,7 +370,7 @@ (defun cmake-help () "Queries for any of the four available help topics and prints out the approriate page." (interactive) - (let* ((default-entry (word-at-point)) + (let* ((default-entry (cmake-symbol-at-point)) (command-list (cmake-get-list "command")) (variable-list (cmake-get-list "variable")) (module-list (cmake-get-list "module")) diff -Nru cmake-3.0.2/Auxiliary/cmake-syntax.vim cmake-3.2.2/Auxiliary/cmake-syntax.vim --- cmake-3.0.2/Auxiliary/cmake-syntax.vim 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/Auxiliary/cmake-syntax.vim 2015-04-13 17:09:00.000000000 +0000 @@ -16,7 +16,7 @@ " Version: $Revision$ " " Licence: The CMake license applies to this file. See -" http://www.cmake.org/HTML/Copyright.html +" http://www.cmake.org/licensing " This implies that distribution with Vim is allowed " For version 5.x: Clear all syntax items @@ -48,9 +48,9 @@ syn keyword cmakeDeprecated ABSTRACT_FILES BUILD_NAME SOURCE_FILES SOURCE_FILES_REMOVE VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WRAP_EXCLUDE_FILES \ nextgroup=cmakeArguments -" The keywords are generated as: cmake --help-command-list | tr "\n" " " +" The keywords are generated as: cmake --help-command-list | tr "\n" " " | tr "[:lower:]" "[:upper:]" syn keyword cmakeStatement - \ ADD_CUSTOM_COMMAND ADD_CUSTOM_TARGET ADD_DEFINITIONS ADD_DEPENDENCIES ADD_EXECUTABLE ADD_LIBRARY ADD_SUBDIRECTORY ADD_TEST AUX_SOURCE_DIRECTORY BUILD_COMMAND BUILD_NAME CMAKE_MINIMUM_REQUIRED CONFIGURE_FILE CREATE_TEST_SOURCELIST ELSE ELSEIF ENABLE_LANGUAGE ENABLE_TESTING ENDFOREACH ENDFUNCTION ENDIF ENDMACRO ENDWHILE EXEC_PROGRAM EXECUTE_PROCESS EXPORT_LIBRARY_DEPENDENCIES FILE FIND_FILE FIND_LIBRARY FIND_PACKAGE FIND_PATH FIND_PROGRAM FLTK_WRAP_UI FOREACH FUNCTION GET_CMAKE_PROPERTY GET_DIRECTORY_PROPERTY GET_FILENAME_COMPONENT GET_SOURCE_FILE_PROPERTY GET_TARGET_PROPERTY GET_TEST_PROPERTY IF INCLUDE INCLUDE_DIRECTORIES INCLUDE_EXTERNAL_MSPROJECT INCLUDE_REGULAR_EXPRESSION INSTALL INSTALL_FILES INSTALL_PROGRAMS INSTALL_TARGETS LINK_DIRECTORIES LINK_LIBRARIES LIST LOAD_CACHE LOAD_COMMAND MACRO MAKE_DIRECTORY MARK_AS_ADVANCED MATH MESSAGE OPTION OUTPUT_REQUIRED_FILES PROJECT QT_WRAP_CPP QT_WRAP_UI REMOVE REMOVE_DEFINITIONS SEPARATE_ARGUMENTS SET SET_DIRECTORY_PROPERTIES SET_SOURCE_FILES_PROPERTIES SET_TARGET_PROPERTIES SET_TESTS_PROPERTIES SITE_NAME SOURCE_GROUP STRING SUBDIR_DEPENDS SUBDIRS TARGET_LINK_LIBRARIES TRY_COMPILE TRY_RUN UNSET USE_MANGLED_MESA UTILITY_SOURCE VARIABLE_REQUIRES VTK_MAKE_INSTANTIATOR VTK_WRAP_JAVA VTK_WRAP_PYTHON VTK_WRAP_TCL WHILE WRITE_FILE + \ ADD_COMPILE_OPTIONS ADD_CUSTOM_COMMAND ADD_CUSTOM_TARGET ADD_DEFINITIONS ADD_DEPENDENCIES ADD_EXECUTABLE ADD_LIBRARY ADD_SUBDIRECTORY ADD_TEST AUX_SOURCE_DIRECTORY BREAK BUILD_COMMAND BUILD_NAME CMAKE_HOST_SYSTEM_INFORMATION CMAKE_MINIMUM_REQUIRED CMAKE_POLICY CONFIGURE_FILE CREATE_TEST_SOURCELIST CTEST_BUILD CTEST_CONFIGURE CTEST_COVERAGE CTEST_EMPTY_BINARY_DIRECTORY CTEST_MEMCHECK CTEST_READ_CUSTOM_FILES CTEST_RUN_SCRIPT CTEST_SLEEP CTEST_START CTEST_SUBMIT CTEST_TEST CTEST_UPDATE CTEST_UPLOAD DEFINE_PROPERTY ELSE ELSEIF ENABLE_LANGUAGE ENABLE_TESTING ENDFOREACH ENDFUNCTION ENDIF ENDMACRO ENDWHILE EXEC_PROGRAM EXECUTE_PROCESS EXPORT EXPORT_LIBRARY_DEPENDENCIES FILE FIND_FILE FIND_LIBRARY FIND_PACKAGE FIND_PATH FIND_PROGRAM FLTK_WRAP_UI FOREACH FUNCTION GET_CMAKE_PROPERTY GET_DIRECTORY_PROPERTY GET_FILENAME_COMPONENT GET_PROPERTY GET_SOURCE_FILE_PROPERTY GET_TARGET_PROPERTY GET_TEST_PROPERTY IF INCLUDE INCLUDE_DIRECTORIES INCLUDE_EXTERNAL_MSPROJECT INCLUDE_REGULAR_EXPRESSION INSTALL INSTALL_FILES INSTALL_PROGRAMS INSTALL_TARGETS LINK_DIRECTORIES LINK_LIBRARIES LIST LOAD_CACHE LOAD_COMMAND MACRO MAKE_DIRECTORY MARK_AS_ADVANCED MATH MESSAGE OPTION OUTPUT_REQUIRED_FILES PROJECT QT_WRAP_CPP QT_WRAP_UI REMOVE REMOVE_DEFINITIONS RETURN SEPARATE_ARGUMENTS SET SET_DIRECTORY_PROPERTIES SET_PROPERTY SET_SOURCE_FILES_PROPERTIES SET_TARGET_PROPERTIES SET_TESTS_PROPERTIES SITE_NAME SOURCE_GROUP STRING SUBDIR_DEPENDS SUBDIRS TARGET_COMPILE_DEFINITIONS TARGET_COMPILE_FEATURES TARGET_COMPILE_OPTIONS TARGET_INCLUDE_DIRECTORIES TARGET_LINK_LIBRARIES TARGET_SOURCES TRY_COMPILE TRY_RUN UNSET USE_MANGLED_MESA UTILITY_SOURCE VARIABLE_REQUIRES VARIABLE_WATCH WHILE WRITE_FILE \ nextgroup=cmakeArguments syn keyword cmakeTodo \ TODO FIXME XXX diff -Nru cmake-3.0.2/bootstrap cmake-3.2.2/bootstrap --- cmake-3.0.2/bootstrap 2014-09-11 13:24:02.000000000 +0000 +++ cmake-3.2.2/bootstrap 2015-04-13 17:09:03.000000000 +0000 @@ -72,6 +72,7 @@ cmake_bootstrap_qt_qmake="" cmake_sphinx_man="" cmake_sphinx_html="" +cmake_sphinx_qthelp="" cmake_sphinx_build="" # Determine whether this is a Cygwin environment. @@ -122,17 +123,32 @@ cmake_system_openvms=false fi +# Determine whether this is HP-UX +if echo "${cmake_system}" | grep HP-UX >/dev/null 2>&1; then + cmake_system_hpux=true +else + cmake_system_hpux=false +fi + # Determine whether this is Linux if echo "${cmake_system}" | grep Linux >/dev/null 2>&1; then cmake_system_linux=true - # find out if it is a HP PA-RISC machine +else + cmake_system_linux=false + fi + +# Determine whether this is a PA-RISC machine +# This only works for Linux or HP-UX, not other PA-RISC OSs (BSD maybe?). Also +# may falsely detect parisc on HP-UX m68k +cmake_machine_parisc=false +if ${cmake_system_linux}; then if uname -m | grep parisc >/dev/null 2>&1; then cmake_machine_parisc=true - else - cmake_machine_parisc=false fi -else - cmake_system_linux=false +elif ${cmake_system_hpux}; then + if uname -m | grep ia64 >/dev/null 2>&1; then : ; else + cmake_machine_parisc=true + fi fi # Choose the generator to use for bootstrapping. @@ -225,13 +241,13 @@ " CMAKE_CXX_SOURCES="\ - cmStandardIncludes \ cmake \ cmakemain \ cmcmd \ cmCommandArgumentLexer \ cmCommandArgumentParser \ cmCommandArgumentParserHelper \ + cmCPackPropertiesGenerator \ cmDefinitions \ cmDepends \ cmDependsC \ @@ -258,6 +274,7 @@ cmGeneratorExpression \ cmGlobalGenerator \ cmLocalGenerator \ + cmInstalledFile \ cmInstallGenerator \ cmInstallExportGenerator \ cmInstallFilesGenerator \ @@ -329,6 +346,7 @@ KWSYS_CXX_SOURCES="\ Directory \ EncodingCXX \ + FStream \ Glob \ RegularExpression \ SystemTools" @@ -380,6 +398,8 @@ --no-system-curl use cmake-provided curl library (default) --system-expat use system-installed expat library --no-system-expat use cmake-provided expat library (default) + --system-jsoncpp use system-installed jsoncpp library + --no-system-jsoncpp use cmake-provided jsoncpp library (default) --system-zlib use system-installed zlib library --no-system-zlib use cmake-provided zlib library (default) --system-bzip2 use system-installed bzip2 library @@ -393,6 +413,7 @@ --sphinx-man build man pages with Sphinx --sphinx-html build html help with Sphinx + --sphinx-qthelp build qch help with Sphinx --sphinx-build= use as the sphinx-build executable Directory and file names: @@ -618,10 +639,10 @@ --init=*) cmake_init_file=`cmake_arg "$1"` ;; --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;; --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;; - --system-bzip2|--system-curl|--system-expat|--system-libarchive|--system-zlib) + --system-bzip2|--system-curl|--system-expat|--system-jsoncpp|--system-libarchive|--system-zlib) lib=`cmake_arg "$1" "--system-"` cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;; - --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-libarchive|--no-system-zlib) + --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib) lib=`cmake_arg "$1" "--no-system-"` cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;; --qt-gui) cmake_bootstrap_qt_gui="1" ;; @@ -629,6 +650,7 @@ --qt-qmake=*) cmake_bootstrap_qt_qmake=`cmake_arg "$1"` ;; --sphinx-man) cmake_sphinx_man="1" ;; --sphinx-html) cmake_sphinx_html="1" ;; + --sphinx-qthelp) cmake_sphinx_qthelp="1" ;; --sphinx-build=*) cmake_sphinx_build=`cmake_arg "$1"` ;; --help) cmake_usage ;; --version) cmake_version_display ; exit 2 ;; @@ -741,11 +763,13 @@ cmake_ld_flags="${LDFLAGS} -lroot -lbe" fi -if ${cmake_system_linux}; then - # avoid binutils problem with large binaries, e.g. when building CMake in debug mode - # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 - if ${cmake_machine_parisc}; then - cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*" +# Workaround for short jump tables on PA-RISC +if ${cmake_machine_parisc}; then + if ${cmake_c_compiler_is_gnu}; then + cmake_c_flags="${CFLAGS} -mlong-calls" + fi + if ${cmake_cxx_compiler_is_gnu}; then + cmake_cxx_flags="${CXXFLAGS} -mlong-calls" fi fi @@ -1134,6 +1158,35 @@ cmake_test_flags= fi + +if [ "x${cmake_cxx_compiler_is_gnu}" != "x1" ]; then + # Are we SolarisStudio? + + TMPFILE=`cmake_tmp_file` + echo ' + #if defined(__SUNPRO_CC) + #include + int main() { std::cout << "This is SolarisStudio" << std::endl; return 0;} + #endif + ' > ${TMPFILE}.cxx + cmake_cxx_compiler_is_solarisstudio=0 + if cmake_try_run "${cmake_cxx_compiler}" \ + "${cmake_cxx_flags} " "${TMPFILE}.cxx" >> cmake_bootstrap.log 2>&1; then + cmake_cxx_compiler_is_solarisstudio=1 + fi + if [ "x${cmake_cxx_compiler_is_solarisstudio}" = "x1" ]; then + echo "${cmake_cxx_compiler} is SolarisStudio compiler" + else + echo "${cmake_cxx_compiler} is not SolarisStudio compiler" + fi + rm -f "${TMPFILE}.cxx" + + if [ "x${cmake_cxx_compiler_is_solarisstudio}" = "x1" ]; then + cmake_cxx_flags="${cmake_cxx_flags} -library=stlport4" + fi +fi + + # Test for kwsys features KWSYS_NAME_IS_KWSYS=0 KWSYS_BUILD_SHARED=0 @@ -1442,35 +1495,6 @@ cmake_report cmConfigure.h${_tmp} "${cmake_compiler_settings_comment}" -if [ "x$KWSYS_STL_HAVE_STD" = "x1" ]; then - cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_STD_NAMESPACE */" -else - cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_STD_NAMESPACE 1" -fi - -if [ "x$KWSYS_IOS_USE_ANSI" = "x1" ]; then - cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_ANSI_STREAM_HEADERS */" -else - cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_ANSI_STREAM_HEADERS 1" -fi - -if [ "x$KWSYS_IOS_USE_SSTREAM" = "x1" ]; then - cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_ANSI_STRING_STREAM */" -else - cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_ANSI_STRING_STREAM 1" -fi - -# Test for ansi FOR scope -if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags}" \ - "${cmake_source_dir}/Modules/TestForAnsiForScope.cxx" >> cmake_bootstrap.log 2>&1; then - cmake_report cmConfigure.h${_tmp} "/* #undef CMAKE_NO_ANSI_FOR_SCOPE */" - echo "${cmake_cxx_compiler} has ANSI for scoping" -else - cmake_report cmConfigure.h${_tmp} "#define CMAKE_NO_ANSI_FOR_SCOPE 1" - echo "${cmake_cxx_compiler} does not have ANSI for scoping" -fi - # When bootstrapping on MinGW with MSYS we must convert the source # directory to a windows path. if ${cmake_system_mingw}; then @@ -1642,6 +1666,11 @@ set (SPHINX_HTML "'"${cmake_sphinx_html}"'" CACHE FILEPATH "Build html help with Sphinx" FORCE) ' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake" fi +if [ "x${cmake_sphinx_qthelp}" != "x" ]; then + echo ' +set (SPHINX_QTHELP "'"${cmake_sphinx_qthelp}"'" CACHE FILEPATH "Build qch help with Sphinx" FORCE) +' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake" +fi if [ "x${cmake_sphinx_build}" != "x" ]; then echo ' set (SPHINX_EXECUTABLE "'"${cmake_sphinx_build}"'" CACHE FILEPATH "Location of Qt sphinx-build" FORCE) diff -Nru cmake-3.0.2/CMakeCPack.cmake cmake-3.2.2/CMakeCPack.cmake --- cmake-3.0.2/CMakeCPack.cmake 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/CMakeCPack.cmake 2015-04-13 17:09:00.000000000 +0000 @@ -50,7 +50,7 @@ if(NOT DEFINED CPACK_SYSTEM_NAME) # make sure package is not Cygwin-unknown, for Cygwin just # cygwin is good for the system name - if("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN") + if("x${CMAKE_SYSTEM_NAME}" STREQUAL "xCYGWIN") set(CPACK_SYSTEM_NAME Cygwin) else() set(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}) @@ -59,11 +59,37 @@ if(${CPACK_SYSTEM_NAME} MATCHES Windows) if(CMAKE_CL_64) set(CPACK_SYSTEM_NAME win64-x64) + set(CPACK_IFW_TARGET_DIRECTORY "@RootDir@/Program Files/${CMAKE_PROJECT_NAME}") else() set(CPACK_SYSTEM_NAME win32-x86) endif() endif() + if(${CMAKE_SYSTEM_NAME} MATCHES Windows) + set(_CPACK_IFW_PACKAGE_ICON + "set(CPACK_IFW_PACKAGE_ICON \"${CMake_SOURCE_DIR}/Source/QtDialog/CMakeSetup.ico\")") + if(BUILD_QtDialog) + set(_CPACK_IFW_SHORTCUT_OPTIONAL "${_CPACK_IFW_SHORTCUT_OPTIONAL}component.addOperation(\"CreateShortcut\", \"@TargetDir@/bin/cmake-gui.exe\", \"@StartMenuDir@/CMake (cmake-gui).lnk\");\n") + endif() + if(SPHINX_HTML) + set(_CPACK_IFW_SHORTCUT_OPTIONAL "${_CPACK_IFW_SHORTCUT_OPTIONAL}component.addOperation(\"CreateShortcut\", \"@TargetDir@/doc/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}/html/index.html\", \"@StartMenuDir@/CMake Documentation.lnk\");\n") + endif() + configure_file("${CMake_SOURCE_DIR}/Source/QtIFW/installscript.qs.in" + "${CMake_BINARY_DIR}/installscript.qs" @ONLY + ) + install(FILES "${CMake_SOURCE_DIR}/Source/QtIFW/cmake.org.html" + DESTINATION "." + ) + set(_CPACK_IFW_PACKAGE_SCRIPT "set(CPACK_IFW_COMPONENT_GROUP_CMAKE_SCRIPT \"${CMake_BINARY_DIR}/installscript.qs\")") + endif() + + if(${CMAKE_SYSTEM_NAME} MATCHES Linux) + set(CPACK_IFW_TARGET_DIRECTORY "@HomeDir@/${CMAKE_PROJECT_NAME}") + set(CPACK_IFW_ADMIN_TARGET_DIRECTORY "@ApplicationsDir@/${CMAKE_PROJECT_NAME}") + endif() + + set(_CPACK_IFW_PACKAGE_VERSION ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}) + if(NOT DEFINED CPACK_PACKAGE_FILE_NAME) # if the CPACK_PACKAGE_FILE_NAME is not defined by the cache # default to source package - system, on cygwin system is not diff -Nru cmake-3.0.2/CMakeCPackOptions.cmake.in cmake-3.2.2/CMakeCPackOptions.cmake.in --- cmake-3.0.2/CMakeCPackOptions.cmake.in 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/CMakeCPackOptions.cmake.in 2015-04-13 17:09:00.000000000 +0000 @@ -31,6 +31,28 @@ # they might not if qt was not enabled for the build include("@QT_DIALOG_CPACK_OPTIONS_FILE@" OPTIONAL) +if(CPACK_GENERATOR MATCHES "IFW") + # Installer configuration + set(CPACK_IFW_PACKAGE_TITLE "CMake Build Tool") + set(CPACK_IFW_PRODUCT_URL "http://www.cmake.org") + @_CPACK_IFW_PACKAGE_ICON@ + set(CPACK_IFW_PACKAGE_WINDOW_ICON + "@CMake_SOURCE_DIR@/Source/QtDialog/CMakeSetup128.png") + # Package configuration group + set(CPACK_IFW_PACKAGE_GROUP CMake) + # Group configuration + set(CPACK_COMPONENT_GROUP_CMAKE_DISPLAY_NAME + "@CPACK_PACKAGE_NAME@") + set(CPACK_COMPONENT_GROUP_CMAKE_DESCRIPTION + "@CPACK_PACKAGE_DESCRIPTION_SUMMARY@") + # IFW group configuration + set(CPACK_IFW_COMPONENT_GROUP_CMAKE_VERSION + "@_CPACK_IFW_PACKAGE_VERSION@") + set(CPACK_IFW_COMPONENT_GROUP_CMAKE_LICENSES + "@CPACK_PACKAGE_NAME@ Copyright" "@CPACK_RESOURCE_FILE_LICENSE@") + @_CPACK_IFW_PACKAGE_SCRIPT@ +endif() + if(CPACK_GENERATOR MATCHES "CygwinSource") # when packaging source make sure the .build directory is not included set(CPACK_SOURCE_IGNORE_FILES diff -Nru cmake-3.0.2/CMakeLists.txt cmake-3.2.2/CMakeLists.txt --- cmake-3.0.2/CMakeLists.txt 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/CMakeLists.txt 2015-04-13 17:09:00.000000000 +0000 @@ -21,7 +21,9 @@ unset(CMAKE_BOOTSTRAP CACHE) endif() -set(CMake_BIN_DIR ${CMake_BINARY_DIR}/bin) +if(NOT CMake_TEST_EXTERNAL_CMAKE) + set(CMake_BIN_DIR ${CMake_BINARY_DIR}/bin) +endif() if("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") # Disallow architecture-specific try_run. It may not run on the host. @@ -34,6 +36,21 @@ endmacro() endif() +# Use most-recent available language dialects with GNU and Clang +if(NOT DEFINED CMAKE_C_STANDARD) + set(CMAKE_C_STANDARD 11) +endif() +if(NOT DEFINED CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 14) +endif() + +# option to set the internal encoding of CMake to UTF-8 +option(CMAKE_ENCODING_UTF8 "Use UTF-8 encoding internally." ON) +mark_as_advanced(CMAKE_ENCODING_UTF8) +if(CMAKE_ENCODING_UTF8) + set(KWSYS_ENCODING_DEFAULT_CODEPAGE CP_UTF8) +endif() + #----------------------------------------------------------------------- # a macro to deal with system libraries, implemented as a macro # simply to improve readability of the main script @@ -48,7 +65,7 @@ # Allow the user to enable/disable all system utility library options by # defining CMAKE_USE_SYSTEM_LIBRARIES or CMAKE_USE_SYSTEM_LIBRARY_${util}. - set(UTILITIES BZIP2 CURL EXPAT LIBARCHIVE ZLIB) + set(UTILITIES BZIP2 CURL EXPAT FORM JSONCPP LIBARCHIVE LIBLZMA ZLIB) foreach(util ${UTILITIES}) if(NOT DEFINED CMAKE_USE_SYSTEM_LIBRARY_${util} AND DEFINED CMAKE_USE_SYSTEM_LIBRARIES) @@ -84,6 +101,10 @@ "${CMAKE_USE_SYSTEM_LIBRARY_ZLIB}" "NOT CMAKE_USE_SYSTEM_LIBARCHIVE;NOT CMAKE_USE_SYSTEM_CURL" ON) CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_BZIP2 "Use system-installed bzip2" "${CMAKE_USE_SYSTEM_LIBRARY_BZIP2}" "NOT CMAKE_USE_SYSTEM_LIBARCHIVE" ON) + CMAKE_DEPENDENT_OPTION(CMAKE_USE_SYSTEM_LIBLZMA "Use system-installed liblzma" + "${CMAKE_USE_SYSTEM_LIBRARY_LIBLZMA}" "NOT CMAKE_USE_SYSTEM_LIBARCHIVE" ON) + option(CMAKE_USE_SYSTEM_FORM "Use system-installed libform" "${CMAKE_USE_SYSTEM_LIBRARY_FORM}") + option(CMAKE_USE_SYSTEM_JSONCPP "Use system-installed jsoncpp" "${CMAKE_USE_SYSTEM_LIBRARY_JSONCPP}") # Mention to the user what system libraries are being used. foreach(util ${UTILITIES}) @@ -102,9 +123,11 @@ -set(CMAKE_BUILD_ON_VISUAL_STUDIO 0) -if(WIN32 AND NOT UNIX AND NOT BORLAND AND NOT MINGW ) - set(CMAKE_BUILD_ON_VISUAL_STUDIO 1) +if(NOT CMake_TEST_EXTERNAL_CMAKE) + set(CMAKE_BUILD_ON_VISUAL_STUDIO 0) + if(WIN32 AND NOT UNIX AND NOT MINGW) + set(CMAKE_BUILD_ON_VISUAL_STUDIO 1) + endif() endif() @@ -114,29 +137,6 @@ #----------------------------------------------------------------------- macro(CMAKE_SETUP_TESTING) if(BUILD_TESTING) - set(CMAKE_TEST_GENERATOR "" CACHE STRING - "Generator used when running tests") - set(CMAKE_TEST_MAKEPROGRAM "" CACHE FILEPATH - "Generator used when running tests") - if(NOT CMAKE_TEST_GENERATOR) - set(CMAKE_TEST_GENERATOR "${CMAKE_GENERATOR}") - set(CMAKE_TEST_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}") - else() - set(CMAKE_TEST_DIFFERENT_GENERATOR TRUE) - set(CMAKE_TEST_GENERATOR_TOOLSET "") - endif() - - # Are we testing with the MSVC compiler? - set(CMAKE_TEST_MSVC 0) - if(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR) - set(CMAKE_TEST_MSVC 1) - else() - if("${CMAKE_TEST_GENERATOR}" MATCHES "NMake" OR - "${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio") - set(CMAKE_TEST_MSVC 1) - endif() - endif() - set(CMAKE_TEST_SYSTEM_LIBRARIES 0) foreach(util CURL EXPAT XMLRPC ZLIB) if(CMAKE_USE_SYSTEM_${util}) @@ -149,9 +149,19 @@ # the ctest from this cmake is used for testing # and not the ctest from the cmake building and testing # cmake. - set(CMAKE_CTEST_COMMAND "${CMake_BIN_DIR}/ctest") - set(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake") - set(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack") + if(CMake_TEST_EXTERNAL_CMAKE) + set(CMAKE_CTEST_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/ctest") + set(CMAKE_CMAKE_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/cmake") + set(CMAKE_CPACK_COMMAND "${CMake_TEST_EXTERNAL_CMAKE}/cpack") + foreach(exe cmake ctest cpack) + add_executable(${exe} IMPORTED) + set_property(TARGET ${exe} PROPERTY IMPORTED_LOCATION ${CMake_TEST_EXTERNAL_CMAKE}/${exe}) + endforeach() + else() + set(CMAKE_CTEST_COMMAND "${CMake_BIN_DIR}/ctest") + set(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake") + set(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack") + endif() endif() # configure some files for testing @@ -164,8 +174,6 @@ ${CMake_BINARY_DIR}/Modules/.NoDartCoverage) configure_file(${CMake_SOURCE_DIR}/CTestCustom.cmake.in ${CMake_BINARY_DIR}/CTestCustom.cmake @ONLY) - configure_file(${CMake_SOURCE_DIR}/CTestCustom.ctest.in - ${CMake_BINARY_DIR}/CTestCustom.ctest @ONLY) if(BUILD_TESTING AND DART_ROOT) configure_file(${CMake_SOURCE_DIR}/CMakeLogo.gif ${CMake_BINARY_DIR}/Testing/HTML/TestingResults/Icons/Logo.gif COPYONLY) @@ -205,12 +213,6 @@ #----------------------------------------------------------------------- macro (CMAKE_BUILD_UTILITIES) #--------------------------------------------------------------------- - # Create the KWIML library for CMake. - set(KWIML cmIML) - set(KWIML_HEADER_ROOT ${CMake_BINARY_DIR}/Utilities) - add_subdirectory(Utilities/KWIML) - - #--------------------------------------------------------------------- # Create the kwsys library for CMake. set(KWSYS_NAMESPACE cmsys) set(KWSYS_USE_SystemTools 1) @@ -279,15 +281,19 @@ set(CURL_SPECIAL_ZLIB_H ${CMAKE_ZLIB_HEADER}) set(CURL_SPECIAL_LIBZ_INCLUDES ${CMAKE_ZLIB_INCLUDES}) set(CURL_SPECIAL_LIBZ ${CMAKE_ZLIB_LIBRARIES}) - option(CMAKE_BUILD_CURL_SHARED "Should curl be built shared" FALSE) - if(NOT CMAKE_BUILD_CURL_SHARED) - add_definitions(-DCURL_STATICLIB) - endif() + add_definitions(-DCURL_STATICLIB) set(CMAKE_CURL_INCLUDES) set(CMAKE_CURL_LIBRARIES cmcurl) if(CMAKE_TESTS_CDASH_SERVER) set(CMAKE_CURL_TEST_URL "${CMAKE_TESTS_CDASH_SERVER}/user.php") endif() + option(CMAKE_USE_OPENSSL "Use OpenSSL." OFF) + mark_as_advanced(CMAKE_USE_OPENSSL) + if(CMAKE_USE_OPENSSL) + set(CURL_CA_BUNDLE "" CACHE FILEPATH "Path to SSL CA Certificate Bundle") + set(CURL_CA_PATH "" CACHE PATH "Path to SSL CA Certificate Directory") + mark_as_advanced(CURL_CA_BUNDLE CURL_CA_PATH) + endif() add_subdirectory(Utilities/cmcurl) CMAKE_SET_TARGET_FOLDER(cmcurl "Utilities/3rdParty") CMAKE_SET_TARGET_FOLDER(LIBCURL "Utilities/3rdParty") @@ -311,9 +317,26 @@ endif() #--------------------------------------------------------------------- + # Build or use system liblzma for libarchive. + if(CMAKE_USE_SYSTEM_LIBLZMA) + find_package(LibLZMA) + if(NOT LIBLZMA_FOUND) + message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBLZMA is ON but LibLZMA is not found!") + endif() + set(LZMA_INCLUDE_DIR ${LIBLZMA_INCLUDE_DIRS}) + set(LZMA_LIBRARY ${LIBLZMA_LIBRARIES}) + else() + add_subdirectory(Utilities/cmliblzma) + CMAKE_SET_TARGET_FOLDER(cmliblzma "Utilities/3rdParty") + set(LZMA_INCLUDE_DIR + "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmliblzma/liblzma/api") + set(LZMA_LIBRARY cmliblzma) + endif() + + #--------------------------------------------------------------------- # Build or use system libarchive for CMake and CTest. if(CMAKE_USE_SYSTEM_LIBARCHIVE) - find_package(LibArchive) + find_package(LibArchive 3.0.0) if(NOT LibArchive_FOUND) message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBARCHIVE is ON but LibArchive is not found!") endif() @@ -325,6 +348,12 @@ add_definitions(-DLIBARCHIVE_STATIC) set(ENABLE_NETTLE OFF CACHE INTERNAL "Enable use of Nettle") set(ENABLE_OPENSSL ${CMAKE_USE_OPENSSL} CACHE INTERNAL "Enable use of OpenSSL") + set(ENABLE_LZMA ON CACHE INTERNAL "Enable the use of the system found LZMA library if found") + set(ENABLE_ZLIB ON CACHE INTERNAL "Enable the use of the system found ZLIB library if found") + set(ENABLE_BZip2 ON CACHE INTERNAL "Enable the use of the system found BZip2 library if found") + set(ENABLE_EXPAT OFF CACHE INTERNAL "Enable the use of the system found EXPAT library if found") + set(ENABLE_PCREPOSIX OFF CACHE INTERNAL "Enable the use of the system found PCREPOSIX library if found") + set(ENABLE_LibGCC OFF CACHE INTERNAL "Enable the use of the system found LibGCC library if found") set(ENABLE_XATTR OFF CACHE INTERNAL "Enable extended attribute support") set(ENABLE_ACL OFF CACHE INTERNAL "Enable ACL support") set(ENABLE_ICONV OFF CACHE INTERNAL "Enable iconv support") @@ -351,6 +380,25 @@ endif() #--------------------------------------------------------------------- + # Build jsoncpp library. + if(CMAKE_USE_SYSTEM_JSONCPP) + if(NOT CMAKE_VERSION VERSION_LESS 3.0) + include(${CMake_SOURCE_DIR}/Source/Modules/FindJsonCpp.cmake) + else() + message(FATAL_ERROR "CMAKE_USE_SYSTEM_JSONCPP requires CMake >= 3.0") + endif() + if(NOT JsonCpp_FOUND) + message(FATAL_ERROR + "CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!") + endif() + set(CMAKE_JSONCPP_LIBRARIES JsonCpp::JsonCpp) + else() + set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp) + add_subdirectory(Utilities/cmjsoncpp) + CMAKE_SET_TARGET_FOLDER(cmjsoncpp "Utilities/3rdParty") + endif() + + #--------------------------------------------------------------------- # Build XMLRPC library for CMake and CTest. if(CTEST_USE_XMLRPC) find_package(XMLRPC QUIET REQUIRED libwww-client) @@ -366,7 +414,7 @@ # Use curses? if (UNIX) # there is a bug in the Syllable libraries which makes linking ccmake fail, Alex - if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES syllable) + if(NOT CMAKE_SYSTEM_NAME MATCHES syllable) set(CURSES_NEED_NCURSES TRUE) find_package(Curses QUIET) if (CURSES_LIBRARY) @@ -382,23 +430,29 @@ set(BUILD_CursesDialog 0) endif () if(BUILD_CursesDialog) - add_subdirectory(Source/CursesDialog/form) + if(NOT CMAKE_USE_SYSTEM_FORM) + add_subdirectory(Source/CursesDialog/form) + elseif(NOT CURSES_FORM_LIBRARY) + message( FATAL_ERROR "CMAKE_USE_SYSTEM_FORM in ON but CURSES_FORM_LIBRARY is not set!" ) + endif() endif() endmacro () #----------------------------------------------------------------------- -if(CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD") - execute_process(COMMAND ${CMAKE_CXX_COMPILER} - ${CMAKE_CXX_COMPILER_ARG1} -dumpversion - OUTPUT_VARIABLE _GXX_VERSION - ) - string(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2" - _GXX_VERSION_SHORT ${_GXX_VERSION}) - if(_GXX_VERSION_SHORT EQUAL 33) - message(FATAL_ERROR - "GXX 3.3 on OpenBSD is known to cause CPack to Crash.\n" - "Please use GXX 4.2 or greater to build CMake on OpenBSD\n" - "${CMAKE_CXX_COMPILER} version is: ${_GXX_VERSION}") +if(NOT CMake_TEST_EXTERNAL_CMAKE) + if(CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD") + execute_process(COMMAND ${CMAKE_CXX_COMPILER} + ${CMAKE_CXX_COMPILER_ARG1} -dumpversion + OUTPUT_VARIABLE _GXX_VERSION + ) + string(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2" + _GXX_VERSION_SHORT ${_GXX_VERSION}) + if(_GXX_VERSION_SHORT EQUAL 33) + message(FATAL_ERROR + "GXX 3.3 on OpenBSD is known to cause CPack to Crash.\n" + "Please use GXX 4.2 or greater to build CMake on OpenBSD\n" + "${CMAKE_CXX_COMPILER} version is: ${_GXX_VERSION}") + endif() endif() endif() @@ -417,35 +471,37 @@ set_directory_properties(PROPERTIES TEST_INCLUDE_FILE "${CMake_BINARY_DIR}/Tests/EnforceConfig.cmake") -# where to write the resulting executables and libraries -set(BUILD_SHARED_LIBS OFF) -set(EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL "No configurable exe dir.") -set(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL - "Where to put the libraries for CMake") - -# The CMake executables usually do not need any rpath to run in the build or -# install tree. -set(CMAKE_SKIP_RPATH ON CACHE INTERNAL "CMake does not need RPATHs.") - -# Load install destinations. -include(Source/CMakeInstallDestinations.cmake) - -if(BUILD_TESTING) - include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake) -endif() - -# include special compile flags for some compilers -include(CompileFlags.cmake) - -# no clue why we are testing for this here -include(CheckSymbolExists) -CHECK_SYMBOL_EXISTS(unsetenv "stdlib.h" HAVE_UNSETENV) -CHECK_SYMBOL_EXISTS(environ "stdlib.h" HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE) +if(NOT CMake_TEST_EXTERNAL_CMAKE) + # where to write the resulting executables and libraries + set(BUILD_SHARED_LIBS OFF) + set(EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL "No configurable exe dir.") + set(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL + "Where to put the libraries for CMake") + + # The CMake executables usually do not need any rpath to run in the build or + # install tree. + set(CMAKE_SKIP_RPATH ON CACHE INTERNAL "CMake does not need RPATHs.") + + # Load install destinations. + include(Source/CMakeInstallDestinations.cmake) + + if(BUILD_TESTING) + include(${CMake_SOURCE_DIR}/Tests/CMakeInstall.cmake) + endif() + + # include special compile flags for some compilers + include(CompileFlags.cmake) + + # no clue why we are testing for this here + include(CheckSymbolExists) + CHECK_SYMBOL_EXISTS(unsetenv "stdlib.h" HAVE_UNSETENV) + CHECK_SYMBOL_EXISTS(environ "stdlib.h" HAVE_ENVIRON_NOT_REQUIRE_PROTOTYPE) +endif() # CMAKE_TESTS_CDASH_SERVER: CDash server used by CMake/Tests. # # If not defined or "", this variable defaults to the server at -# http://www.cdash.org/CDash. +# "http://open.cdash.org". # # If set explicitly to "NOTFOUND", curl tests and ctest tests that use # the network are skipped. @@ -456,136 +512,146 @@ # should be run first. # if("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x") - set(CMAKE_TESTS_CDASH_SERVER "http://www.cdash.org/CDash") + set(CMAKE_TESTS_CDASH_SERVER "http://open.cdash.org") endif() -# build the utilities (a macro defined in this file) -CMAKE_BUILD_UTILITIES() - -# On NetBSD ncurses is required, since curses doesn't have the wsyncup() -# function. ncurses is installed via pkgsrc, so the library is in /usr/pkg/lib, -# which isn't in the default linker search path. So without RPATH ccmake -# doesn't run and the build doesn't succeed since ccmake is executed for -# generating the documentation. -if(BUILD_CursesDialog) - get_filename_component(_CURSES_DIR "${CURSES_LIBRARY}" PATH) - set(CURSES_NEED_RPATH FALSE) - if(NOT "${_CURSES_DIR}" STREQUAL "/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/lib64" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib64") - set(CURSES_NEED_RPATH TRUE) +# Create the KWIML library for CMake. +set(KWIML cmIML) +set(KWIML_HEADER_ROOT ${CMake_BINARY_DIR}/Utilities) +add_subdirectory(Utilities/KWIML) + +if(NOT CMake_TEST_EXTERNAL_CMAKE) + # build the utilities (a macro defined in this file) + CMAKE_BUILD_UTILITIES() + + # On NetBSD ncurses is required, since curses doesn't have the wsyncup() + # function. ncurses is installed via pkgsrc, so the library is in /usr/pkg/lib, + # which isn't in the default linker search path. So without RPATH ccmake + # doesn't run and the build doesn't succeed since ccmake is executed for + # generating the documentation. + if(BUILD_CursesDialog) + get_filename_component(_CURSES_DIR "${CURSES_LIBRARY}" PATH) + set(CURSES_NEED_RPATH FALSE) + if(NOT "${_CURSES_DIR}" STREQUAL "/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib" AND NOT "${_CURSES_DIR}" STREQUAL "/lib64" AND NOT "${_CURSES_DIR}" STREQUAL "/usr/lib64") + set(CURSES_NEED_RPATH TRUE) + endif() endif() -endif() -if(BUILD_QtDialog) - if(APPLE) - set(CMAKE_BUNDLE_VERSION - "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") - set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}") - # make sure CMAKE_INSTALL_PREFIX ends in / - string(LENGTH "${CMAKE_INSTALL_PREFIX}" LEN) - math(EXPR LEN "${LEN} -1" ) - string(SUBSTRING "${CMAKE_INSTALL_PREFIX}" ${LEN} 1 ENDCH) - if(NOT "${ENDCH}" STREQUAL "/") - set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") + if(BUILD_QtDialog) + if(APPLE) + set(CMAKE_BUNDLE_VERSION + "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") + set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}") + # make sure CMAKE_INSTALL_PREFIX ends in / + string(LENGTH "${CMAKE_INSTALL_PREFIX}" LEN) + math(EXPR LEN "${LEN} -1" ) + string(SUBSTRING "${CMAKE_INSTALL_PREFIX}" ${LEN} 1 ENDCH) + if(NOT "${ENDCH}" STREQUAL "/") + set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") + endif() + set(CMAKE_INSTALL_PREFIX + "${CMAKE_INSTALL_PREFIX}CMake.app/Contents") endif() - set(CMAKE_INSTALL_PREFIX - "${CMAKE_INSTALL_PREFIX}CMake.app/Contents") - endif() - set(QT_NEED_RPATH FALSE) - if(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64") - set(QT_NEED_RPATH TRUE) + set(QT_NEED_RPATH FALSE) + if(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64") + set(QT_NEED_RPATH TRUE) + endif() endif() -endif() -# The same might be true on other systems for other libraries. -# Then only enable RPATH if we have are building at least with cmake 2.4, -# since this one has much better RPATH features than cmake 2.2. -# The executables are then built with the RPATH for the libraries outside -# the build tree, which is both the build and the install RPATH. -if (UNIX) - if( CMAKE_USE_SYSTEM_CURL OR CMAKE_USE_SYSTEM_ZLIB - OR CMAKE_USE_SYSTEM_EXPAT OR CTEST_USE_XMLRPC OR CURSES_NEED_RPATH OR QT_NEED_RPATH) - set(CMAKE_SKIP_RPATH OFF CACHE INTERNAL "CMake built with RPATH.") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - endif() -endif () + # The same might be true on other systems for other libraries. + # Then only enable RPATH if we have are building at least with cmake 2.4, + # since this one has much better RPATH features than cmake 2.2. + # The executables are then built with the RPATH for the libraries outside + # the build tree, which is both the build and the install RPATH. + if (UNIX) + if( CMAKE_USE_SYSTEM_CURL OR CMAKE_USE_SYSTEM_ZLIB + OR CMAKE_USE_SYSTEM_EXPAT OR CTEST_USE_XMLRPC OR CURSES_NEED_RPATH OR QT_NEED_RPATH) + set(CMAKE_SKIP_RPATH OFF CACHE INTERNAL "CMake built with RPATH.") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + endif() + endif () -# add the uninstall support -configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - @ONLY) -add_custom_target(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") + # add the uninstall support + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + @ONLY) + add_custom_target(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -include (CMakeCPack.cmake) + include (CMakeCPack.cmake) + +endif() # setup some Testing support (a macro defined in this file) CMAKE_SETUP_TESTING() -configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/DartLocal.conf.in" - "${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf" - COPYONLY) - -if(NOT CMake_VERSION_IS_RELEASE) - if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" AND - NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS 4.2) - set(C_FLAGS_LIST -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts - -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security - -Wmissing-format-attribute -fno-common -Wundef - ) - set(CXX_FLAGS_LIST -Wnon-virtual-dtor -Wcast-align -Wchar-subscripts -Wall -W - -Wshadow -Wpointer-arith -Wformat-security -Wundef - ) - foreach(FLAG_LANG C CXX) - foreach(FLAG ${${FLAG_LANG}_FLAGS_LIST}) - if(NOT " ${CMAKE_${FLAG_LANG}_FLAGS} " MATCHES " ${FLAG} ") - set(CMAKE_${FLAG_LANG}_FLAGS "${CMAKE_${FLAG_LANG}_FLAGS} ${FLAG}") - endif() +if(NOT CMake_TEST_EXTERNAL_CMAKE) + if(NOT CMake_VERSION_IS_RELEASE) + if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND + NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS 4.2) + set(C_FLAGS_LIST -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts + -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security + -Wmissing-format-attribute -fno-common -Wundef + ) + set(CXX_FLAGS_LIST -Wnon-virtual-dtor -Wcast-align -Wchar-subscripts -Wall -W + -Wshadow -Wpointer-arith -Wformat-security -Wundef + ) + + foreach(FLAG_LANG C CXX) + foreach(FLAG ${${FLAG_LANG}_FLAGS_LIST}) + if(NOT " ${CMAKE_${FLAG_LANG}_FLAGS} " MATCHES " ${FLAG} ") + set(CMAKE_${FLAG_LANG}_FLAGS "${CMAKE_${FLAG_LANG}_FLAGS} ${FLAG}") + endif() + endforeach() endforeach() - endforeach() - unset(C_FLAGS_LIST) - unset(CXX_FLAGS_LIST) + unset(C_FLAGS_LIST) + unset(CXX_FLAGS_LIST) + endif() endif() + + # build the remaining subdirectories + add_subdirectory(Source) + add_subdirectory(Utilities) endif() -# build the remaining subdirectories -add_subdirectory(Source) -add_subdirectory(Utilities) add_subdirectory(Tests) -if(BUILD_TESTING) - CMAKE_SET_TARGET_FOLDER(CMakeLibTests "Tests") -endif() -CMAKE_SET_TARGET_FOLDER(cmw9xcom "Utilities/Win9xCompat") -if(TARGET documentation) - CMAKE_SET_TARGET_FOLDER(documentation "Documentation") +if(NOT CMake_TEST_EXTERNAL_CMAKE) + if(BUILD_TESTING) + CMAKE_SET_TARGET_FOLDER(CMakeLibTests "Tests") + endif() + if(TARGET documentation) + CMAKE_SET_TARGET_FOLDER(documentation "Documentation") + endif() endif() # add a test add_test(SystemInformationNew "${CMAKE_CMAKE_COMMAND}" - --system-information -G "${CMAKE_TEST_GENERATOR}" ) - -# Install license file as it requires. -install(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR}) + --system-information -G "${CMAKE_GENERATOR}" ) -# Install script directories. -install( - DIRECTORY Help Modules Templates - DESTINATION ${CMAKE_DATA_DIR} - FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - PATTERN "*.sh*" PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - ) +if(NOT CMake_TEST_EXTERNAL_CMAKE) + # Install license file as it requires. + install(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR}) + + # Install script directories. + install( + DIRECTORY Help Modules Templates + DESTINATION ${CMAKE_DATA_DIR} + FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + DIRECTORY_PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + PATTERN "*.sh*" PERMISSIONS OWNER_READ OWNER_EXECUTE OWNER_WRITE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) -# Install auxiliary files integrating with other tools. -add_subdirectory(Auxiliary) + # Install auxiliary files integrating with other tools. + add_subdirectory(Auxiliary) +endif() diff -Nru cmake-3.0.2/cmake_uninstall.cmake.in cmake-3.2.2/cmake_uninstall.cmake.in --- cmake-3.0.2/cmake_uninstall.cmake.in 2014-09-11 13:24:02.000000000 +0000 +++ cmake-3.2.2/cmake_uninstall.cmake.in 2015-04-13 17:09:03.000000000 +0000 @@ -3,7 +3,7 @@ endif() file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) -string(REGEX REPLACE "\n" ";" files "${files}") +string(REPLACE "\n" ";" files "${files}") foreach(file ${files}) message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") if(EXISTS "$ENV{DESTDIR}${file}") diff -Nru cmake-3.0.2/CompileFlags.cmake cmake-3.2.2/CompileFlags.cmake --- cmake-3.0.2/CompileFlags.cmake 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/CompileFlags.cmake 2015-04-13 17:09:00.000000000 +0000 @@ -16,11 +16,8 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio 7") set(CMAKE_SKIP_COMPATIBILITY_TESTS 1) endif() -if(CMAKE_GENERATOR MATCHES "Visual Studio 6") - set(CMAKE_SKIP_COMPATIBILITY_TESTS 1) -endif() -if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$") +if(WIN32 AND CMAKE_C_COMPILER_ID STREQUAL "Intel") set(_INTEL_WINDOWS 1) endif() @@ -34,20 +31,20 @@ endif() #silence duplicate symbol warnings on AIX -if(CMAKE_SYSTEM MATCHES "AIX.*") +if(CMAKE_SYSTEM_NAME MATCHES "AIX") if(NOT CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -bhalt:5 ") endif() endif() -if(CMAKE_SYSTEM MATCHES "IRIX.*") +if(CMAKE_SYSTEM_NAME MATCHES "IRIX") if(NOT CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-woff84 -no_auto_include") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-woff15") endif() endif() -if(CMAKE_SYSTEM MATCHES "OSF1-V.*") +if(CMAKE_SYSTEM MATCHES "OSF1-V") if(NOT CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -timplicit_local -no_implicit_include ") endif() @@ -65,6 +62,24 @@ endif() endif() +# Workaround for short jump tables on PA-RISC +if(CMAKE_SYSTEM_PROCESSOR MATCHES "^parisc") + if(CMAKE_COMPILER_IS_GNUC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-calls") + endif() + if(CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-calls") + endif() +endif() + +if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro) + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4") + endif() +endif() + # use the ansi CXX compile flag for building cmake if (CMAKE_ANSI_CXXFLAGS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_ANSI_CXXFLAGS}") @@ -73,11 +88,3 @@ if (CMAKE_ANSI_CFLAGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ANSI_CFLAGS}") endif () - -# avoid binutils problem with large binaries, e.g. when building CMake in debug mode -# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230 -if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*") -endif () - -include (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake) diff -Nru cmake-3.0.2/Copyright.txt cmake-3.2.2/Copyright.txt --- cmake-3.0.2/Copyright.txt 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/Copyright.txt 2015-04-13 17:09:00.000000000 +0000 @@ -1,5 +1,5 @@ CMake - Cross Platform Makefile Generator -Copyright 2000-2014 Kitware, Inc. +Copyright 2000-2015 Kitware, Inc. Copyright 2000-2011 Insight Software Consortium All rights reserved. diff -Nru cmake-3.0.2/CTestConfig.cmake cmake-3.2.2/CTestConfig.cmake --- cmake-3.0.2/CTestConfig.cmake 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/CTestConfig.cmake 2015-04-13 17:09:00.000000000 +0000 @@ -13,13 +13,8 @@ set(CTEST_NIGHTLY_START_TIME "1:00:00 UTC") set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "www.cdash.org") -set(CTEST_DROP_LOCATION "/CDash/submit.php?project=CMake") +set(CTEST_DROP_SITE "open.cdash.org") +set(CTEST_DROP_LOCATION "/submit.php?project=CMake") set(CTEST_DROP_SITE_CDASH TRUE) set(CTEST_CDASH_VERSION "1.6") set(CTEST_CDASH_QUERY_VERSION TRUE) - -# use old trigger stuff so that cmake 2.4 and below will not -# get errors on trigger -set (TRIGGER_SITE - "http://public.kitware.com/cgi-bin/Submit-CMake-TestingResults.cgi") diff -Nru cmake-3.0.2/CTestCustom.cmake.in cmake-3.2.2/CTestCustom.cmake.in --- cmake-3.0.2/CTestCustom.cmake.in 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/CTestCustom.cmake.in 2015-04-13 17:09:00.000000000 +0000 @@ -19,6 +19,7 @@ "Utilities.cmbzip2." "Source.CTest.Curl" "Source.CursesDialog.form" + "Source.cm_sha2.*warning.*cast increases required alignment of target type" "Utilities.cmcurl" "Utilities.cmexpat." "Utilities.cmlibarchive" @@ -39,12 +40,14 @@ "Warning: public.*BZ2_bz.*in module.*bzlib.*clashes with prior module.*bzlib.*" "Warning: public.*_archive.*clashes with prior module.*" "Warning: LINN32: Last line.*is less.*" + "Warning: Olimit was exceeded on function.*" + "Warning: To override Olimit for all functions in file.*" "warning.*directory name.*CMake-Xcode.*/bin/.*does not exist.*" "stl_deque.h:1051" "(Lexer|Parser).*warning.*conversion.*may (alter its value|change the sign)" - "(Lexer|Parser).*warning.*statement is unreachable" + "(Lexer|Parser).*warning.*(statement is unreachable|will never be executed)" "PGC-W-0095-Type cast required for this conversion.*ProcessUNIX.c" - "[Qq]t([Cc]ore|[Gg]ui).*warning.*conversion.*may alter its value" + "[Qq]t([Cc]ore|[Gg]ui|[Ww]idgets).*warning.*conversion.*may alter its value" "warning:.*is.*very unsafe.*consider using.*" "warning:.*is.*misused, please use.*" "CMakeSetupManifest.xml.*manifest authoring warning.*Unrecognized Element" @@ -52,6 +55,9 @@ "ld: warning: directory not found for option .-(F|L)" "warning.*This version of Mac OS X is unsupported" "clang.*: warning: argument unused during compilation: .-g" + "note: in expansion of macro" # diagnostic context note + "cm(StringCommand|CTestTestHandler)\\.cxx.*warning.*rand.*isn.*t random" # we do not do crypto + "cm(StringCommand|CTestTestHandler)\\.cxx.*warning.*srand.*seed choices are.*poor" # we do not do crypto # Ignore clang's summary warning, assuming prior text has matched some # other warning expression: diff -Nru cmake-3.0.2/CTestCustom.ctest.in cmake-3.2.2/CTestCustom.ctest.in --- cmake-3.0.2/CTestCustom.ctest.in 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/CTestCustom.ctest.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# This file is provided for compatibility with CMake 2.2 and lower. -# Just include the custom file by its new name. -INCLUDE("CTestCustom.cmake") diff -Nru cmake-3.0.2/DartConfig.cmake cmake-3.2.2/DartConfig.cmake --- cmake-3.0.2/DartConfig.cmake 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/DartConfig.cmake 2015-04-13 17:09:00.000000000 +0000 @@ -13,6 +13,6 @@ set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT") set(CTEST_DROP_METHOD "http") -set(CTEST_DROP_SITE "www.cdash.org") -set(CTEST_DROP_LOCATION "/CDash/submit.php?project=CMake") +set(CTEST_DROP_SITE "open.cdash.org") +set(CTEST_DROP_LOCATION "/submit.php?project=CMake") set(CTEST_DROP_SITE_CDASH TRUE) diff -Nru cmake-3.0.2/DartLocal.conf.in cmake-3.2.2/DartLocal.conf.in --- cmake-3.0.2/DartLocal.conf.in 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/DartLocal.conf.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,121 +0,0 @@ -ExpectedBuilds: \ -{andoria.kitware Linux-g++3.4-KDevelop} \ -{andoria.kitware Linux-g++3.4-SVN} \ -{DASH1.kitware Win32-nmake71} \ -{DASH1.kitware Win32-vs71} \ -{DASH1.kitware Win32-vs71Rel} \ -{DASH1.kitware zRel24-Win32-nmake71} \ -{DASH1.kitware zRel24-Win32-vs71} \ -{DASH11.kitware zRel24-Win32-nmake71} \ -{dash14.kitware Win32-bcc5.6} \ -{dash14.kitware Win32-cygwin} \ -{dash14.kitware Win32-mingw} \ -{dash14.kitware zRel24-Win32-bcc5.6} \ -{dash17.kitware Linux-g++4.0} \ -{dash1win64.kitware Win64-vs80} \ -{dash1win98.kitware Win32-vs60} \ -{DASH2.kitware Win32-nmake70} \ -{DASH2.kitware Win32-vs70} \ -{DASH2.kitware Win32-vs70-InPlace} \ -{DASH2.kitware zRel24-Win32-nmake70} \ -{DASH2.kitware zRel24-Win32-vs70} \ -{DASH3.kitware Win32-nmake60} \ -{DASH3.kitware Win32-vs60} \ -{DASH3.kitware zRel24-Win32-nmake60} \ -{DASH3.kitware zRel24-Win32-vs60} \ -{dash4.kitware Win32-bcc5.8} \ -{DASH5.kitware Linux-gcc332-InPlace} \ -{DASH5.kitware zRel24-Linix-gcc332} \ -{DASH6.kitware zRel24-Linix-gcc332} \ -{dash8.kitware Linux64-g++} \ -{dash8.kitware Linux64-g++332} \ -{dash8.kitware Linux64-g++341} \ -{dash8.kitware zRel24-Linux64-g++} \ -{dash8.kitware zRel24-Linux64-g++332} \ -{dashmacmini1.kitware Darwin-Tiger-Xcode21} \ -{dashmacmini1.kitware zRel24-Darwin-Tiger-g++} \ -{dashmacmini2.kitware DarwinIntel-g++} \ -{dashmacmini2.kitware DarwinIntel-Universal} \ -{dashmacmini2.kitware Darwin-Tiger-Xcode21-univ} \ -{dashmacmini3.kitware Darwin-LeopardIntel-g++} \ -{dashmacmini3.kitware Darwin-LeopardIntel-Universal} \ -{dashmacmini3.kitware Darwin-Leopard-Xcode21-univ} \ -{dashsgi1.kitware IRIX32-CC} \ -{dashsgi1.kitware IRIX64-CC} \ -{dashsun1.kitware SunOS-CC} \ -{dashsun1.kitware SunOS-CC-64} \ -{dashsun1.kitware SunOS-gcc34-64} \ -{destiny.kitware HP-UX-aCC} \ -{destiny.kitware HP-UX-aCC-gmake} \ -{devqnx.acfr.usyd.edu.au qnx-V3.3.5-gcc_ntox86} \ -{grayson.kitware Win32-nmake80} \ -{heart HP-UXia64-aCC} \ -{hythloth.kitware Linux64-bullseye-cov} \ -{hythloth.kitware Linux64-suncc-5.9} \ -{hythloth.kitware Linux-nightly-win32-release} \ -{insight.journal.kitware KWStyle} \ -{iris.elemtech IRIX64-CC64-7.4} \ -{iris.elemtech IRIX64-CC-7.4} \ -{JET.kitware Linux-valgrind2} \ -{krondor.kitware Darwin-c++} \ -{krondor.kitware zRel24-Darwin-c++} \ -{midworld.kitware DarwinG5-g++} \ -{midworld.kitware DarwinG5-XCode15} \ -{midworld.kitware zRel24-DarwinG5-g++} \ -{pre.vision.cs.rpi.edu FreeBSD-CC-gmake} \ -{pre.vision.cs.rpi.edu FreeBSD-CC-make} \ -{RogueResearch3 Mac10.5-CMake-gcc-dbg-ppc} \ -{RogueResearch3 Mac10.5-CMake-gcc-dbg-ppc64} \ -{RogueResearch3 Mac10.5-CMake-gcc-rel-ppc} \ -{RogueResearch3 Mac10.5-CMake-gcc-rel-ppc64} \ -{RogueResearch3 Mac10.5-CMake-Xcode-dbg-ppc} \ -{RogueResearch3 Mac10.5-CMake-Xcode-dbg-ppc64} \ -{RogueResearch4 Mac10.5-CMake-gcc-dbg-i386} \ -{RogueResearch4 Mac10.5-CMake-gcc-dbg-rosetta} \ -{RogueResearch4 Mac10.5-CMake-gcc-rel-i386} \ -{tick.rz.uni-augsburg.de LinuxPPC-g++3.3} \ -{tick.rz.uni-augsburg.de LinuxPPC-g++3.4} \ -{trinsic.kitware Win32-mingw} \ -{r06n01.pbm.ihost.com AIX53-xlC} \ -{r06n01.pbm.ihost.com zRel24-AIX53-xlC} \ -{valhalla.kitware Win32-wcl386} - -#{devqnx.acfr.usyd.edu.au qnx-V3.3.5-gcc_ntox86 } \ -#{mr-orange.obtech.net gentoo-linux-x86\_64-gcc-4.0.2 } \ -#{G5.Nfsnet.Org Darwin8.3-gcc4} \ - -# commas in names do not work for expected builds.... - -#{G4.Nfsnet.Org Darwin-c++} \ -#{salmon.nlm.nih.gov Darwin8.7-gcc4} \ - -#{crd.ge.com Solaris-gcc343} \ -#{crd.ge.com Linux-icc81} \ -#{crd.ge.com Windows-bcc32} \ -#{crd.ge.com Windows-nmake71} \ -#{crd.ge.com Windows-nmake60} \ - -#{dash16.kitware Linux-g++4.0} \ -#{styx Linuxia64-g++} \ -#{crd.ge.com Cygwin-gcc344} \ -#{valhalla.kitware Win32-bccRel} \ -#{valhalla.kitware Win32-bcc} \ -#{valhalla.kitware Win32-g++} \ -#{valhalla.kitware Win32-nmake60} \ -#{valhalla.kitware Win32-nmake70} \ -#{valhalla.kitware Win32-vs60} \ -#{valhalla.kitware Win32-vs70} -#{crd.ge.com FreeBSD-gcc321} \ -#{crd.ge.com Linux-gcc320} \ - -#{cogattaca.kitware LinuxWin32-g++-Werror} \ -#{cogattaca.kitware LinuxWin32-g++} \ - -#{dash8.kitware Win64-icl80} \ -#{dash8.kitware zLRB-Win64-icl80} \ - -#{hythloth.kitware Linux-icc-8.1} \ - -CompressionMode: ALL -CompressionCommand: /bin/gzip -CompressionType: gzip diff -Nru cmake-3.0.2/debian/changelog cmake-3.2.2/debian/changelog --- cmake-3.0.2/debian/changelog 2014-10-31 20:59:40.000000000 +0000 +++ cmake-3.2.2/debian/changelog 2015-05-29 09:22:23.000000000 +0000 @@ -1,3 +1,64 @@ +cmake (3.2.2-2ubuntu1) wily; urgency=low + + * Merge from Debian unstable (LP: #1459727). Remaining changes: + - debian/cmake-data.install + debian/MultiArchCross.cmake + debian/patches/ubuntu_cmake-crosscompile.patch + Add MultiArchCross.cmake to installed files. + (help cmake to find libraries in multiarch path) + xnox says this is not yet ready to go upstream but he will work on it + - debian/patches/ubuntu_boost-multiarch.patch + find boost and python in multiarch path + this is a candidate for removal but needs rdepend testing + + -- Gianfranco Costamagna Thu, 28 May 2015 17:35:43 +0200 + +cmake (3.2.2-2) unstable; urgency=medium + + * Make cmake.bash-completion use wildcards for the minor version + thus avoiding installing the file as a script (Closes: #785267). + + -- Lisandro Damián Nicanor Pérez Meyer Wed, 13 May 2015 23:04:05 -0300 + +cmake (3.2.2-1) unstable; urgency=medium + + [ Mario Lang ] + * New upstream release (Closes: #780704). + - Fixes version detection in the OpenSSL module. (Closes: #784443) + * Add myself to Uploaders. + * Build-Depend on liblzma-dev and libjsoncpp-dev. + * Drop patches merged upstream: + - fix-FindImageMagick-1.diff + - fix-FindImageMagick-2.diff + - FindJNI_ppc64le.diff + - hurd_host_system_processor.diff + * Refresh patches: + - FindBoost_add_-lpthread_#563479.diff + - FindJNI.cmake.mips.patch + - fix-ftbfs-on-kfreebsd.patch + - fix-hdf5-hl.patch + - qt_import_dir_variable.diff + * Bump Standards-Version to 3.9.6. + * Fix "Typo in cpack documentation" by adding new patch cpack-doc-typo.patch + (Closes: #760298) + * debian/cmake-data.install: Install new manpage cmake-compile-features.7 + + [ Felix Geyer ] + * Build cmake-qt-gui against Qt 5 again. + * Add protect-tests-from-makeflags.patch, cherry-picked from upstream. + - Fixes running the test suite in parallel from dh_auto_test. + * Make builds reproducible. + - Add custom-sphinx-flags.patch, cherry-picked from upstream. + - Pass the date from d/changelog to sphinx. + * Add libcurl-ssl-dev as an alternative build-dependency to + libcurl4-openssl-dev. (Closes: #785128) + * Properly detect mipsel as little endian architecture. (Closes: #785126) + - Add fix-mips-endian.patch + * Fix detection of openjdk 8. (Closes: #772631) + - Add openjdk-8-detection.patch + + -- Felix Geyer Wed, 13 May 2015 19:02:05 +0200 + cmake (3.0.2-1ubuntu2) vivid; urgency=medium * Fix install path of MultiArchCross.cmake to be cmake-3.0. diff -Nru cmake-3.0.2/debian/cmake.bash-completion cmake-3.2.2/debian/cmake.bash-completion --- cmake-3.0.2/debian/cmake.bash-completion 2014-10-29 16:40:23.000000000 +0000 +++ cmake-3.2.2/debian/cmake.bash-completion 2015-05-14 01:37:36.000000000 +0000 @@ -1,3 +1,3 @@ -debian/tmp/usr/share/cmake-3.0/completions/cmake -debian/tmp/usr/share/cmake-3.0/completions/cpack -debian/tmp/usr/share/cmake-3.0/completions/ctest +debian/tmp/usr/share/cmake-3.*/completions/cmake +debian/tmp/usr/share/cmake-3.*/completions/cpack +debian/tmp/usr/share/cmake-3.*/completions/ctest diff -Nru cmake-3.0.2/debian/cmake-data.install cmake-3.2.2/debian/cmake-data.install --- cmake-3.0.2/debian/cmake-data.install 2014-10-31 20:59:20.000000000 +0000 +++ cmake-3.2.2/debian/cmake-data.install 2015-05-29 09:22:23.000000000 +0000 @@ -1,9 +1,10 @@ debian/cmake.xpm usr/share/pixmaps usr/share/aclocal/cmake.m4 -usr/share/cmake-3.0/* -usr/share/cmake-3.0/editors/emacs/cmake-mode.el usr/share/emacs/site-lisp +usr/share/cmake-3.2/* +usr/share/cmake-3.2/editors/emacs/cmake-mode.el usr/share/emacs/site-lisp usr/share/man/man7/cmake-buildsystem.7 usr/share/man/man7/cmake-commands.7 +usr/share/man/man7/cmake-compile-features.7 usr/share/man/man7/cmake-developer.7 usr/share/man/man7/cmake-generator-expressions.7 usr/share/man/man7/cmake-generators.7 diff -Nru cmake-3.0.2/debian/cmake-qt-gui.install cmake-3.2.2/debian/cmake-qt-gui.install --- cmake-3.0.2/debian/cmake-qt-gui.install 2014-10-29 16:40:23.000000000 +0000 +++ cmake-3.2.2/debian/cmake-qt-gui.install 2015-05-14 00:22:47.000000000 +0000 @@ -2,4 +2,4 @@ usr/share/applications/CMake.desktop usr/share/man/man1/cmake-gui.1 usr/share/mime/packages/cmakecache.xml -usr/share/pixmaps/CMakeSetup32.png +usr/share/icons/hicolor/*/apps/CMakeSetup.png diff -Nru cmake-3.0.2/debian/control cmake-3.2.2/debian/control --- cmake-3.0.2/debian/control 2014-10-29 16:51:23.000000000 +0000 +++ cmake-3.2.2/debian/control 2015-05-29 09:22:23.000000000 +0000 @@ -6,19 +6,22 @@ Uploaders: A. Maitland Bottoms , Kai Wasserbäch , Lisandro Damián Nicanor Pérez Meyer , - Felix Geyer + Felix Geyer , + Mario Lang Build-Depends: bash-completion, debhelper (>= 9.20131104), libarchive-dev (>= 2.8.0), libbz2-dev, - libcurl4-openssl-dev, + libcurl4-openssl-dev | libcurl-ssl-dev, libexpat1-dev, + libjsoncpp-dev, + liblzma-dev, libncurses5-dev, procps [!hurd-any], python-sphinx, - libqt4-dev (>= 4.4.0), + qtbase5-dev, zlib1g-dev -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/collab-maint/cmake.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/cmake.git;a=summary Homepage: http://cmake.org/ diff -Nru cmake-3.0.2/debian/copyright cmake-3.2.2/debian/copyright --- cmake-3.0.2/debian/copyright 2014-10-29 16:40:23.000000000 +0000 +++ cmake-3.2.2/debian/copyright 2015-05-14 00:22:47.000000000 +0000 @@ -133,7 +133,7 @@ copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . diff -Nru cmake-3.0.2/debian/patches/cpack-doc-typo.patch cmake-3.2.2/debian/patches/cpack-doc-typo.patch --- cmake-3.0.2/debian/patches/cpack-doc-typo.patch 1970-01-01 00:00:00.000000000 +0000 +++ cmake-3.2.2/debian/patches/cpack-doc-typo.patch 2015-05-14 00:22:47.000000000 +0000 @@ -0,0 +1,13 @@ +diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake +index 35259c4..4b66964 100644 +--- a/Modules/CPack.cmake ++++ b/Modules/CPack.cmake +@@ -228,7 +228,7 @@ + # + # List of four values that specify what project to install. The four values + # are: Build directory, Project Name, Project Component, Directory. If +-# omitted, CPack will build an installer that installers everything. ++# omitted, CPack will build an installer that installs everything. + # + # .. variable:: CPACK_SYSTEM_NAME + # diff -Nru cmake-3.0.2/debian/patches/custom-sphinx-flags.patch cmake-3.2.2/debian/patches/custom-sphinx-flags.patch --- cmake-3.0.2/debian/patches/custom-sphinx-flags.patch 1970-01-01 00:00:00.000000000 +0000 +++ cmake-3.2.2/debian/patches/custom-sphinx-flags.patch 2015-05-14 00:22:47.000000000 +0000 @@ -0,0 +1,79 @@ +From dd107b30d26b2cdaa5b1766f733428f3c4c7cd42 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Thu, 30 Apr 2015 09:30:14 -0400 +Subject: [PATCH] Add option to pass custom flags to sphinx-build (#15545) + +Create a SPHINX_FLAGS cache entry that users can populate with +command-line flags for sphinx-build. Add an option to the +bootstrap script to populate it up front. + +Suggested-by: Felix Geyer +--- + Utilities/Sphinx/CMakeLists.txt | 4 ++++ + bootstrap | 8 ++++++++ + 2 files changed, 12 insertions(+) + +diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt +index da81752..a755ca1 100644 +--- a/Utilities/Sphinx/CMakeLists.txt ++++ b/Utilities/Sphinx/CMakeLists.txt +@@ -31,8 +31,11 @@ find_program(SPHINX_EXECUTABLE + NAMES sphinx-build + DOC "Sphinx Documentation Builder (sphinx-doc.org)" + ) ++set(SPHINX_FLAGS "" CACHE STRING "Flags to pass to sphinx-build") ++separate_arguments(sphinx_flags UNIX_COMMAND "${SPHINX_FLAGS}") + + mark_as_advanced(SPHINX_TEXT) ++mark_as_advanced(SPHINX_FLAGS) + + if(NOT SPHINX_MAN AND NOT SPHINX_HTML AND NOT SPHINX_SINGLEHTML AND NOT SPHINX_QTHELP AND NOT SPHINX_TEXT) + return() +@@ -114,6 +117,7 @@ foreach(format ${doc_formats}) + -c ${CMAKE_CURRENT_BINARY_DIR} + -d ${CMAKE_CURRENT_BINARY_DIR}/doctrees + -b ${format} ++ ${sphinx_flags} + ${CMake_SOURCE_DIR}/Help + ${CMAKE_CURRENT_BINARY_DIR}/${format} + > ${doc_format_log} # log stdout, pass stderr +diff --git a/bootstrap b/bootstrap +index 00b51b5..14046ee 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -74,6 +74,7 @@ cmake_sphinx_man="" + cmake_sphinx_html="" + cmake_sphinx_qthelp="" + cmake_sphinx_build="" ++cmake_sphinx_flags="" + + # Determine whether this is a Cygwin environment. + if echo "${cmake_system}" | grep CYGWIN >/dev/null 2>&1; then +@@ -423,6 +424,7 @@ Configuration: + --sphinx-html build html help with Sphinx + --sphinx-qthelp build qch help with Sphinx + --sphinx-build= use as the sphinx-build executable ++ --sphinx-flags= pass to sphinx-build executable + + Directory and file names: + --prefix=PREFIX install files in tree rooted at PREFIX +@@ -660,6 +662,7 @@ while test $# != 0; do + --sphinx-html) cmake_sphinx_html="1" ;; + --sphinx-qthelp) cmake_sphinx_qthelp="1" ;; + --sphinx-build=*) cmake_sphinx_build=`cmake_arg "$1"` ;; ++ --sphinx-flags=*) cmake_sphinx_flags=`cmake_arg "$1"` ;; + --help) cmake_usage ;; + --version) cmake_version_display ; exit 2 ;; + --verbose) cmake_verbose=TRUE ;; +@@ -1684,6 +1687,11 @@ if [ "x${cmake_sphinx_build}" != "x" ]; then + set (SPHINX_EXECUTABLE "'"${cmake_sphinx_build}"'" CACHE FILEPATH "Location of Qt sphinx-build" FORCE) + ' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake" + fi ++if [ "x${cmake_sphinx_flags}" != "x" ]; then ++ echo ' ++set (SPHINX_FLAGS [==['"${cmake_sphinx_flags}"']==] CACHE STRING "Flags to pass to sphinx-build" FORCE) ++' >> "${cmake_bootstrap_dir}/InitialCacheFlags.cmake" ++fi + + # Add user-specified settings. Handle relative-path case for + # specification of cmake_init_file. diff -Nru cmake-3.0.2/debian/patches/FindBoost_add_-lpthread_#563479.diff cmake-3.2.2/debian/patches/FindBoost_add_-lpthread_#563479.diff --- cmake-3.0.2/debian/patches/FindBoost_add_-lpthread_#563479.diff 2014-10-29 16:45:30.000000000 +0000 +++ cmake-3.2.2/debian/patches/FindBoost_add_-lpthread_#563479.diff 2015-05-14 00:22:47.000000000 +0000 @@ -7,11 +7,11 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=563479 Forwarded: http://cmake.org/Bug/file_download.php?file_id=3629&type=bug -Index: cmake-3.0.2/Modules/FindBoost.cmake +Index: cmake/Modules/FindBoost.cmake =================================================================== ---- cmake-3.0.2.orig/Modules/FindBoost.cmake -+++ cmake-3.0.2/Modules/FindBoost.cmake -@@ -445,6 +445,22 @@ function(_Boost_GUESS_COMPILER_PREFIX _r +--- cmake.orig/Modules/FindBoost.cmake ++++ cmake/Modules/FindBoost.cmake +@@ -447,6 +447,22 @@ function(_Boost_GUESS_COMPILER_PREFIX _r set(${_ret} ${_boost_COMPILER} PARENT_SCOPE) endfunction() @@ -34,7 +34,7 @@ # # End functions/macros # -@@ -1174,6 +1190,9 @@ if(Boost_FOUND) +@@ -1177,6 +1193,9 @@ if(Boost_FOUND) list(APPEND Boost_LIBRARIES ${Boost_${UPPERCOMPONENT}_LIBRARY}) endif() endforeach() diff -Nru cmake-3.0.2/debian/patches/FindJNI.cmake.mips.patch cmake-3.2.2/debian/patches/FindJNI.cmake.mips.patch --- cmake-3.0.2/debian/patches/FindJNI.cmake.mips.patch 2014-10-29 16:45:39.000000000 +0000 +++ cmake-3.2.2/debian/patches/FindJNI.cmake.mips.patch 2015-05-14 00:22:47.000000000 +0000 @@ -7,10 +7,10 @@ Add support for mips64 mips64el mipsn32 mipsn32el in Modules/FindJNI.cmake. -Index: cmake-3.0.2/Modules/FindJNI.cmake +Index: cmake/Modules/FindJNI.cmake =================================================================== ---- cmake-3.0.2.orig/Modules/FindJNI.cmake -+++ cmake-3.0.2/Modules/FindJNI.cmake +--- cmake.orig/Modules/FindJNI.cmake ++++ cmake/Modules/FindJNI.cmake @@ -53,7 +53,7 @@ macro(java_append_library_directories _v elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") # mips* machines are bi-endian mostly so processor does not tell @@ -18,5 +18,5 @@ - set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb") + set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb" "mips64" "mips64el" "mipsn32" "mipsn32el") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le") - set(_java_libarch "ppc64le") + set(_java_libarch "ppc64" "ppc64le") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") diff -Nru cmake-3.0.2/debian/patches/FindJNI_ppc64le.diff cmake-3.2.2/debian/patches/FindJNI_ppc64le.diff --- cmake-3.0.2/debian/patches/FindJNI_ppc64le.diff 2014-10-29 16:45:49.000000000 +0000 +++ cmake-3.2.2/debian/patches/FindJNI_ppc64le.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: FindJNI: Add ppc64le architecture -Author: Dinar Valeev -Origin: upstream, commit 18ac6713e8657cca8fc791bcd581a47a7be6ebce - -Index: cmake-3.0.2/Modules/FindJNI.cmake -=================================================================== ---- cmake-3.0.2.orig/Modules/FindJNI.cmake -+++ cmake-3.0.2/Modules/FindJNI.cmake -@@ -55,7 +55,7 @@ macro(java_append_library_directories _v - # endianess of the underlying system. - set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb" "mips64" "mips64el" "mipsn32" "mipsn32el") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le") -- set(_java_libarch "ppc64le") -+ set(_java_libarch "ppc64" "ppc64le") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") - set(_java_libarch "ppc64" "ppc") - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") diff -Nru cmake-3.0.2/debian/patches/fix-FindImageMagick-1.diff cmake-3.2.2/debian/patches/fix-FindImageMagick-1.diff --- cmake-3.0.2/debian/patches/fix-FindImageMagick-1.diff 2014-10-29 16:45:42.000000000 +0000 +++ cmake-3.2.2/debian/patches/fix-FindImageMagick-1.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -From 6f5581c105d59ed00cc065b9ab9b3c8c0a441db3 Mon Sep 17 00:00:00 2001 -From: bastien ROUCARIES -Date: Tue, 22 Jul 2014 22:24:15 +0200 -Subject: [PATCH] FindImageMagick: Find arch include dir (#15007) - ---- - Modules/FindImageMagick.cmake | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -Index: cmake-3.0.2/Modules/FindImageMagick.cmake -=================================================================== ---- cmake-3.0.2.orig/Modules/FindImageMagick.cmake -+++ cmake-3.0.2/Modules/FindImageMagick.cmake -@@ -108,7 +108,19 @@ function(FIND_IMAGEMAGICK_API component - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" - PATH_SUFFIXES - ImageMagick ImageMagick-6 -- DOC "Path to the ImageMagick include dir." -+ DOC "Path to the ImageMagick arch-independent include dir." -+ ) -+ find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR -+ NAMES magick/magick-baseconfig.h -+ HINTS -+ ${PC_${component}_INCLUDEDIR} -+ ${PC_${component}_INCLUDE_DIRS} -+ PATHS -+ ${ImageMagick_INCLUDE_DIRS} -+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ImageMagick\\Current;BinPath]/include" -+ PATH_SUFFIXES -+ ImageMagick ImageMagick-6 -+ DOC "Path to the ImageMagick arch-specific include dir." - ) - find_library(ImageMagick_${component}_LIBRARY - NAMES ${ARGN} -@@ -117,12 +129,17 @@ function(FIND_IMAGEMAGICK_API component - DOC "Path to the ImageMagick Magick++ library." - ) - -+ # old version have only indep dir - if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY) - set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE) - - list(APPEND ImageMagick_INCLUDE_DIRS - ${ImageMagick_${component}_INCLUDE_DIR} - ) -+ if(ImageMagick_${component}_ARCH_INCLUDE_DIR) -+ list(APPEND ImageMagick_INCLUDE_DIRS -+ ${ImageMagick_${component}_ARCH_INCLUDE_DIR}) -+ endif() - list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS) - set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE) - diff -Nru cmake-3.0.2/debian/patches/fix-FindImageMagick-2.diff cmake-3.2.2/debian/patches/fix-FindImageMagick-2.diff --- cmake-3.0.2/debian/patches/fix-FindImageMagick-2.diff 2014-10-29 16:45:44.000000000 +0000 +++ cmake-3.2.2/debian/patches/fix-FindImageMagick-2.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -From 1342e0222fed06f748f266a3a4e82c907cb76726 Mon Sep 17 00:00:00 2001 -From: Brad King -Date: Wed, 23 Jul 2014 15:33:48 -0400 -Subject: [PATCH] FindImageMagick: Provide per-component include dirs (#15007) - -Set the ImageMagick__INCLUDE_DIRS variable that is mentioned -in the documentation but was not set before. ---- - Modules/FindImageMagick.cmake | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -Index: cmake-3.0.2/Modules/FindImageMagick.cmake -=================================================================== ---- cmake-3.0.2.orig/Modules/FindImageMagick.cmake -+++ cmake-3.0.2/Modules/FindImageMagick.cmake -@@ -133,13 +133,20 @@ function(FIND_IMAGEMAGICK_API component - if(ImageMagick_${component}_INCLUDE_DIR AND ImageMagick_${component}_LIBRARY) - set(ImageMagick_${component}_FOUND TRUE PARENT_SCOPE) - -- list(APPEND ImageMagick_INCLUDE_DIRS -+ # Construct per-component include directories. -+ set(ImageMagick_${component}_INCLUDE_DIRS - ${ImageMagick_${component}_INCLUDE_DIR} - ) - if(ImageMagick_${component}_ARCH_INCLUDE_DIR) -- list(APPEND ImageMagick_INCLUDE_DIRS -+ list(APPEND ImageMagick_${component}_INCLUDE_DIRS - ${ImageMagick_${component}_ARCH_INCLUDE_DIR}) - endif() -+ list(REMOVE_DUPLICATES ImageMagick_${component}_INCLUDE_DIRS) -+ set(ImageMagick_${component}_INCLUDE_DIRS -+ ${ImageMagick_${component}_INCLUDE_DIRS} PARENT_SCOPE) -+ -+ # Add the per-component include directories to the full include dirs. -+ list(APPEND ImageMagick_INCLUDE_DIRS ${ImageMagick_${component}_INCLUDE_DIRS}) - list(REMOVE_DUPLICATES ImageMagick_INCLUDE_DIRS) - set(ImageMagick_INCLUDE_DIRS ${ImageMagick_INCLUDE_DIRS} PARENT_SCOPE) - diff -Nru cmake-3.0.2/debian/patches/fix-ftbfs-on-kfreebsd.patch cmake-3.2.2/debian/patches/fix-ftbfs-on-kfreebsd.patch --- cmake-3.0.2/debian/patches/fix-ftbfs-on-kfreebsd.patch 2014-10-29 16:45:36.000000000 +0000 +++ cmake-3.2.2/debian/patches/fix-ftbfs-on-kfreebsd.patch 2015-05-14 00:22:47.000000000 +0000 @@ -14,11 +14,11 @@ [1] https://buildd.debian.org/status/fetch.php?pkg=cmake&arch=kfreebsd-amd64&ver=2.8.12-1&stamp=1383507045 -Index: cmake-3.0.2/Source/kwsys/SystemInformation.cxx +Index: cmake/Source/kwsys/SystemInformation.cxx =================================================================== ---- cmake-3.0.2.orig/Source/kwsys/SystemInformation.cxx -+++ cmake-3.0.2/Source/kwsys/SystemInformation.cxx -@@ -122,7 +122,7 @@ typedef int siginfo_t; +--- cmake.orig/Source/kwsys/SystemInformation.cxx ++++ cmake/Source/kwsys/SystemInformation.cxx +@@ -125,7 +125,7 @@ typedef int siginfo_t; # endif #endif diff -Nru cmake-3.0.2/debian/patches/fix-hdf5-hl.patch cmake-3.2.2/debian/patches/fix-hdf5-hl.patch --- cmake-3.0.2/debian/patches/fix-hdf5-hl.patch 2014-10-29 16:45:46.000000000 +0000 +++ cmake-3.2.2/debian/patches/fix-hdf5-hl.patch 2015-05-14 00:22:47.000000000 +0000 @@ -2,10 +2,10 @@ so that HDF5_{Fortran_,}HL_INCLUDE_DIR and HDF5_{Fortran_,}HL_LIBRARIES are found when the macro is invoked for HL and Fortran_HL components. Author: Gilles Filippini -Index: cmake-3.0.2/Modules/FindHDF5.cmake +Index: cmake/Modules/FindHDF5.cmake =================================================================== ---- cmake-3.0.2.orig/Modules/FindHDF5.cmake -+++ cmake-3.0.2/Modules/FindHDF5.cmake +--- cmake.orig/Modules/FindHDF5.cmake ++++ cmake/Modules/FindHDF5.cmake @@ -223,6 +223,8 @@ if( NOT HDF5_FOUND ) _HDF5_invoke_compiler( C HDF5_C_COMPILE_LINE HDF5_C_RETURN_VALUE ) _HDF5_invoke_compiler( CXX HDF5_CXX_COMPILE_LINE HDF5_CXX_RETURN_VALUE ) diff -Nru cmake-3.0.2/debian/patches/fix-mips-endian.patch cmake-3.2.2/debian/patches/fix-mips-endian.patch --- cmake-3.0.2/debian/patches/fix-mips-endian.patch 1970-01-01 00:00:00.000000000 +0000 +++ cmake-3.2.2/debian/patches/fix-mips-endian.patch 2015-05-14 00:22:47.000000000 +0000 @@ -0,0 +1,40 @@ +From b1d560a0b9e6c545f65c170bdbbcf5da35123b58 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Tue, 12 May 2015 11:38:02 -0400 +Subject: [PATCH] CPU: MIPS is biendian + +MIPS machines are biendian hence they can run both big endian kernels +e.g. Debian mips architecture, and little endian kernels e.g. Debian +mipsel architecture. Use predefined macros to distinguish them. + +Change-Id: I75fccd3cb1ef7915c8754ebbb64cb52a948b4ad8 +Reported-by: Mathieu Malaterre +Inspired-by: Modestas Vainius +--- + CPU.h.in | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/Source/kwsys/CPU.h.in b/Source/kwsys/CPU.h.in +index 626914b..884d71a 100644 +--- a/Source/kwsys/CPU.h.in ++++ b/Source/kwsys/CPU.h.in +@@ -76,7 +76,15 @@ + #elif defined(__m68k__) || defined(M68000) + # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG + +-/* MIPS */ ++/* MIPSel (MIPS little endian) */ ++#elif defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) ++# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_LITTLE ++ ++/* MIPSeb (MIPS big endian) */ ++#elif defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) ++# define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG ++ ++/* MIPS (fallback, big endian) */ + #elif defined(__mips) || defined(__mips__) || defined(__MIPS__) + # define @KWSYS_NAMESPACE@_CPU_ENDIAN_ID @KWSYS_NAMESPACE@_CPU_ENDIAN_ID_BIG + +-- +1.9.1 + diff -Nru cmake-3.0.2/debian/patches/hurd_host_system_processor.diff cmake-3.2.2/debian/patches/hurd_host_system_processor.diff --- cmake-3.0.2/debian/patches/hurd_host_system_processor.diff 2014-10-29 16:40:23.000000000 +0000 +++ cmake-3.2.2/debian/patches/hurd_host_system_processor.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -From 89d7a5a417dccbdc97107d30a6678e94ced9ca5d Mon Sep 17 00:00:00 2001 -From: Felix Geyer -Date: Wed, 10 Sep 2014 08:55:00 -0400 -Subject: [PATCH] Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd - (#15147) - -On Debian GNU/Hurd 'uname -p' prints "unknown", so use 'uname -m' -instead. ---- - Modules/CMakeDetermineSystem.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake -index 1c0941a..fe292ea 100644 ---- a/Modules/CMakeDetermineSystem.cmake -+++ b/Modules/CMakeDetermineSystem.cmake -@@ -47,7 +47,7 @@ if(CMAKE_HOST_UNIX) - if(CMAKE_UNAME) - exec_program(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME) - exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) -- if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin") -+ if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$") - exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR - RETURN_VALUE val) - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND --- -1.7.10.4 - diff -Nru cmake-3.0.2/debian/patches/openjdk-8-detection.patch cmake-3.2.2/debian/patches/openjdk-8-detection.patch --- cmake-3.0.2/debian/patches/openjdk-8-detection.patch 1970-01-01 00:00:00.000000000 +0000 +++ cmake-3.2.2/debian/patches/openjdk-8-detection.patch 2015-05-14 00:22:47.000000000 +0000 @@ -0,0 +1,28 @@ +From 7953867ba46223dfab373ce58cff0a4bc20c3864 Mon Sep 17 00:00:00 2001 +From: Felix Geyer +Date: Tue, 12 May 2015 13:45:43 -0400 +Subject: [PATCH] FindJava: Fix OpenJDK 8 version detection (#15565) + +The openjdk-8 (8u45-b14-2) package on Debian unstable has extra +text after the version number components. Match this and add it +to the reported version string. +--- + Modules/FindJava.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake +index bb73853..9e43174 100644 +--- a/Modules/FindJava.cmake ++++ b/Modules/FindJava.cmake +@@ -137,7 +137,7 @@ if(Java_JAVA_EXECUTABLE) + elseif(var MATCHES "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+)\"") + # Kaffe style + set(Java_VERSION_STRING "${CMAKE_MATCH_1}") +- elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+)\"") ++ elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+.*)\"") + # OpenJDK ver 1.7.x on OpenBSD + set(Java_VERSION_STRING "${CMAKE_MATCH_1}") + else() +-- +1.7.10.4 + diff -Nru cmake-3.0.2/debian/patches/protect-tests-from-makeflags.patch cmake-3.2.2/debian/patches/protect-tests-from-makeflags.patch --- cmake-3.0.2/debian/patches/protect-tests-from-makeflags.patch 1970-01-01 00:00:00.000000000 +0000 +++ cmake-3.2.2/debian/patches/protect-tests-from-makeflags.patch 2015-05-14 00:22:47.000000000 +0000 @@ -0,0 +1,21 @@ +From 703e76252930429ac39d3ebf456e3e1e688d1982 Mon Sep 17 00:00:00 2001 +From: Brad King +Date: Wed, 29 Apr 2015 16:13:50 -0400 +Subject: [PATCH] Tests: Protect RunCMake tests from MAKEFLAGS in environment + (#15542) + +--- + Tests/RunCMake/RunCMake.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake +index b24ae0b..70c0d6c 100644 +--- a/Tests/RunCMake/RunCMake.cmake ++++ b/Tests/RunCMake/RunCMake.cmake +@@ -135,3 +135,6 @@ function(run_cmake_command test) + set(RunCMake_TEST_COMMAND "${ARGN}") + run_cmake(${test}) + endfunction() ++ ++# Protect RunCMake tests from calling environment. ++unset(ENV{MAKEFLAGS}) diff -Nru cmake-3.0.2/debian/patches/qt_import_dir_variable.diff cmake-3.2.2/debian/patches/qt_import_dir_variable.diff --- cmake-3.0.2/debian/patches/qt_import_dir_variable.diff 2014-10-29 16:45:33.000000000 +0000 +++ cmake-3.2.2/debian/patches/qt_import_dir_variable.diff 2015-05-14 00:22:47.000000000 +0000 @@ -8,11 +8,11 @@ This happens when there are no plugins currently installed. -Index: cmake-3.0.2/Modules/FindQt4.cmake +Index: cmake/Modules/FindQt4.cmake =================================================================== ---- cmake-3.0.2.orig/Modules/FindQt4.cmake -+++ cmake-3.0.2/Modules/FindQt4.cmake -@@ -721,7 +721,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) +--- cmake.orig/Modules/FindQt4.cmake ++++ cmake/Modules/FindQt4.cmake +@@ -734,7 +734,7 @@ if (QT_QMAKE_EXECUTABLE AND if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED) _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir) if(qt_imports_dir) diff -Nru cmake-3.0.2/debian/patches/series cmake-3.2.2/debian/patches/series --- cmake-3.0.2/debian/patches/series 2014-10-29 17:03:00.000000000 +0000 +++ cmake-3.2.2/debian/patches/series 2015-05-29 09:22:23.000000000 +0000 @@ -2,10 +2,11 @@ qt_import_dir_variable.diff fix-ftbfs-on-kfreebsd.patch FindJNI.cmake.mips.patch -fix-FindImageMagick-1.diff -fix-FindImageMagick-2.diff fix-hdf5-hl.patch -FindJNI_ppc64le.diff -hurd_host_system_processor.diff +cpack-doc-typo.patch +protect-tests-from-makeflags.patch +custom-sphinx-flags.patch +fix-mips-endian.patch +openjdk-8-detection.patch ubuntu_cmake-crosscompile.patch ubuntu_boost-multiarch.patch diff -Nru cmake-3.0.2/debian/patches/ubuntu_boost-multiarch.patch cmake-3.2.2/debian/patches/ubuntu_boost-multiarch.patch --- cmake-3.0.2/debian/patches/ubuntu_boost-multiarch.patch 2014-10-29 16:48:54.000000000 +0000 +++ cmake-3.2.2/debian/patches/ubuntu_boost-multiarch.patch 2015-05-29 09:22:23.000000000 +0000 @@ -5,7 +5,7 @@ =================================================================== --- cmake-3.0.2.orig/Modules/FindBoost.cmake +++ cmake-3.0.2/Modules/FindBoost.cmake -@@ -887,6 +887,7 @@ else() +@@ -889,6 +889,7 @@ else() list(APPEND _boost_LIBRARY_SEARCH_DIRS ${Boost_INCLUDE_DIR}/lib ${Boost_INCLUDE_DIR}/../lib diff -Nru cmake-3.0.2/debian/patches/ubuntu_cmake-crosscompile.patch cmake-3.2.2/debian/patches/ubuntu_cmake-crosscompile.patch --- cmake-3.0.2/debian/patches/ubuntu_cmake-crosscompile.patch 2014-10-29 16:48:50.000000000 +0000 +++ cmake-3.2.2/debian/patches/ubuntu_cmake-crosscompile.patch 2015-05-29 09:22:23.000000000 +0000 @@ -38,7 +38,7 @@ =================================================================== --- cmake-3.0.2.orig/Modules/FindPkgConfig.cmake +++ cmake-3.0.2/Modules/FindPkgConfig.cmake -@@ -150,6 +150,10 @@ +@@ -30,6 +30,10 @@ ### Common stuff #### set(PKG_CONFIG_VERSION 1) @@ -46,14 +46,14 @@ + include(${CMAKE_ROOT}/Modules/MultiArchCross.cmake OPTIONAL RESULT_VARIABLE _INCLUDED_MULTIARCH_TOOLCHAIN_FILE) +endif() + - find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") - mark_as_advanced(PKG_CONFIG_EXECUTABLE) - + # find pkg-config, use PKG_CONFIG if set + if((NOT PKG_CONFIG_EXECUTABLE) AND (NOT "$ENV{PKG_CONFIG}" STREQUAL "")) + set(PKG_CONFIG_EXECUTABLE "$ENV{PKG_CONFIG}" CACHE FILEPATH "pkg-config executable") Index: cmake-3.0.2/Modules/GNUInstallDirs.cmake =================================================================== --- cmake-3.0.2.orig/Modules/GNUInstallDirs.cmake +++ cmake-3.0.2/Modules/GNUInstallDirs.cmake -@@ -61,6 +61,10 @@ +@@ -72,6 +72,10 @@ # Installation directories # @@ -68,7 +68,7 @@ =================================================================== --- cmake-3.0.2.orig/Modules/AutogenInfo.cmake.in +++ cmake-3.0.2/Modules/AutogenInfo.cmake.in -@@ -12,6 +12,9 @@ set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_D +@@ -13,6 +13,9 @@ set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_D set(AM_QT_MOC_EXECUTABLE "@_qt_moc_executable@") set(AM_QT_UIC_EXECUTABLE "@_qt_uic_executable@") set(AM_QT_RCC_EXECUTABLE "@_qt_rcc_executable@") diff -Nru cmake-3.0.2/debian/rules cmake-3.2.2/debian/rules --- cmake-3.0.2/debian/rules 2014-10-29 16:40:23.000000000 +0000 +++ cmake-3.2.2/debian/rules 2015-05-14 01:31:31.000000000 +0000 @@ -9,6 +9,9 @@ BOOTSTRAP_PARALLEL = --parallel=$(NUMJOBS) endif +LAST_CHANGE = $(shell dpkg-parsechangelog -S Date) +BUILD_DATE = $(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)") + BUILD_FLAGS_FILE = build-flags.cmake set_build_flag = echo 'set($(1) $(2) CACHE \ @@ -37,7 +40,7 @@ rm -rf Build && mkdir -p Build cd Build && ../bootstrap --prefix=/usr --docdir=/share/doc/cmake --mandir=/share/man \ --init=../$(BUILD_FLAGS_FILE) --system-libs \ - --sphinx-man --sphinx-html \ + --sphinx-man --sphinx-html --sphinx-flags="-D today=\"$(BUILD_DATE)\"" \ $(BOOTSTRAP_PARALLEL) --verbose override_dh_auto_test: diff -Nru cmake-3.0.2/.gitattributes cmake-3.2.2/.gitattributes --- cmake-3.0.2/.gitattributes 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/.gitattributes 2015-04-13 17:09:00.000000000 +0000 @@ -12,6 +12,8 @@ *.dsp -crlf *.dsptemplate -crlf *.dsw -crlf +*.pfx -crlf +*.png -crlf *.sln -crlf *.vcproj -crlf diff -Nru cmake-3.0.2/Help/command/add_compile_options.rst cmake-3.2.2/Help/command/add_compile_options.rst --- cmake-3.0.2/Help/command/add_compile_options.rst 2014-09-11 13:24:00.000000000 +0000 +++ cmake-3.2.2/Help/command/add_compile_options.rst 2015-04-13 17:09:00.000000000 +0000 @@ -7,14 +7,15 @@ add_compile_options(