summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ExternalProject_CMAKE_CACHE_DEFAULT_ARGS'Brad King2014-10-311-9/+45
|\ | | | | | | | | | | | | 609037f4 ExternalProject: Add unit tests for CMAKE_CACHE_DEFAULT_ARGS 98cdb658 ExternalProject: Add CMAKE_CACHE_DEFAULT_ARGS arguments 36cf8a1e Tests/Tutorial: Fix when USE_MYMATH is OFF
| * ExternalProject: Add CMAKE_CACHE_DEFAULT_ARGS argumentsDaniele E. Domenichelli2014-10-311-9/+45
| | | | | | | | | | | | | | | | | | | | | | | | This argument allows to set default arguments that are written in the initial cache file, but that are not forced, and therefore allows the user to change these values later (CMAKE_ARGS and CMAKE_CACHE_ARGS always overwrite the values). Also add some documentation to explain the differences between these 3 arguments. Extend ExternalProjectLocal test to cover CMAKE_CACHE_DEFAULT_ARGS.
* | Merge topic 'CheckStructHasMember-avoid-breakage-on-Wall'Brad King2014-10-311-2/+1
|\ \ | | | | | | | | | | | | 8d6ba358 CheckStructHasMember: Avoid clang -Wall breakage (#15203)
| * | CheckStructHasMember: Avoid clang -Wall breakage (#15203)Peter Wu2014-10-301-2/+1
| | | | | | | | | | | | | | | | | | With CMAKE_C_COMPILER=clang and CMAKE_C_FLAGS='-Wall -Werror', this test breaks with -Werror,-Wuninitialized. Fix this by getting rid of the temporary variable.
* | | Merge topic 'dev/alternate-generator-binaries'Brad King2014-10-301-1/+2
|\ \ \ | | | | | | | | | | | | | | | | f04e0a2b ninja: Find alternate Ninja-compatible binaries
| * | | ninja: Find alternate Ninja-compatible binariesBen Boeckel2014-10-291-1/+2
| | | | | | | | | | | | | | | | | | | | On Red Hat distros, Ninja is /usr/bin/ninja-build because /usr/bin/ninja is an IRC bot.
* | | | Merge topic 'cpack-bundle-codesign'Brad King2014-10-301-0/+25
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | bd3fbf36 CPack: Add support for code signing of bundles on MacOS
| * | | CPack: Add support for code signing of bundles on MacOSAndré Klitzing2014-10-281-0/+25
| |/ /
* | | Merge topic 'ExternalProject-format-docs'Brad King2014-10-291-188/+277
|\ \ \ | | | | | | | | | | | | | | | | | | | | d9c2c17b ExternalProject: Use explicit markup and definition lists in docs 98936ae3 ExternalProject: Convert docs to a bracket comment
| * | | ExternalProject: Use explicit markup and definition lists in docsBrad King2014-10-281-139/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert ExternalProject module documentation to use explicit markup blocks for each command. Enumerate command options with definition lists instead of a literal block. This will allow more detail to be added later. Also fix the logic that parses options out of the documentation to be aware of the new layout.
| * | | ExternalProject: Convert docs to a bracket commentBrad King2014-10-281-187/+188
| |/ / | | | | | | | | | | | | | | | | | | Use a bracket comment to hold the documentation instead of a block of line comments. This will make further updates easier. Also fix the logic that parses options out of the documentation to be aware of the new layout.
* | | Merge topic 'FindCurses-include-CheckLibraryExists'Brad King2014-10-291-1/+2
|\ \ \ | |/ / |/| | | | | | | | f11f9579 FindCurses: Include CheckLibraryExists before using it (#15220)
| * | FindCurses: Include CheckLibraryExists before using it (#15220)Brad King2014-10-281-1/+2
| | | | | | | | | | | | | | | Include the module at the top unconditionally so that all code paths can use it.
* | | Merge topic 'osx-gnu-fortran-deployment'Brad King2014-10-281-0/+2
|\ \ \ | | | | | | | | | | | | | | | | 4fc3367f OS X: Detect deployment target flags from GNU Fortran compilers
| * | | OS X: Detect deployment target flags from GNU Fortran compilersBrad King2014-10-271-0/+2
| | | | | | | | | | | | | | | | Reported-by: Bill Somerville <bill@classdesign.com>
* | | | Merge topic 'cpack-rpm-pre-post-install'Brad King2014-10-281-3/+64
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 9ed546ff CPackRPM: Support PREUN and POSTUN requirements add4e50d CPackRPM: Support pre(post) install script requirements
| * | | | CPackRPM: Support PREUN and POSTUN requirementsEvgeny Kalishenko2014-10-271-4/+33
| | | | |
| * | | | CPackRPM: Support pre(post) install script requirementsEvgeny Kalishenko2014-10-271-1/+33
| | | | |
* | | | | Merge topic 'find-boost-no-reroot'Brad King2014-10-281-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 43b8bfb2 FindBoost: fix find_library call when using "re-rooting"
| * | | | | FindBoost: fix find_library call when using "re-rooting"Guillaume Papin2014-10-261-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using CMAKE_FIND_ROOT_PATH, FindBoost is able to find the first component and cache the full path of the directory in Boost_LIBRARY_DIR so that all components are looked for in same directory. The issue was that, when looking for the other components, Boost_LIBRARY_DIR was re-rooted against CMAKE_FIND_ROOT_PATH even though it was already a path on the host. This change fixes this by disabling the re-rooting in the find_library call when using Boost_LIBRARY_DIR as a hint. See http://www.cmake.org/pipermail/cmake-developers/2014-October/011670.html
* | | | | Merge topic 'autorcc-depends'Brad King2014-10-271-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 6e1c359f QtAutogen: Regenerate qrc files if their input changes (#15074) a2995318 QtAutogen: Expand rccfiles into a vector early in the autogen process. 506151af QtAutogen: Extract a GetRccExecutable method.
| * | | | QtAutogen: Regenerate qrc files if their input changes (#15074)Stephen Kelly2014-10-241-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get dependencies from the output of ``rcc --list`` if using Qt 5. Otherwise process the file in the same way as the qt4_add_resources macro. This does not work for RCC files which are generated. The cmake_autogen build step is implemented as a PRE_BUILD step of the target currently if possible, rather than a standalone custom target. This is to keep the number of (synthesized) custom targets that appear in the UI low, but in some cases it is necessary to fall back to a full custom target. Fall back to a full custom target for the VS builds if autorcc is used.
* | | | FPHSA: remove unneeded variable dereferencingRolf Eike Beer2014-10-251-2/+2
|/ / / | | | | | | | | | | | | | | | These variables can be dereferenced by if() alone so do not do it here, avoiding the risk of their content being treated as a variable name and dereferenced again.
* | | Merge topic 'xcode-ios-compiler-id'Brad King2014-10-232-3/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | b91020f6 Xcode: Fix compiler id detection when code signing is required c48f6e12 Xcode: Fix compiler id detection for iOS tools (#15214)
| * | | Xcode: Fix compiler id detection when code signing is requiredBrad King2014-10-222-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iOS product type 'com.apple.package-type.bundle.unit-test' requires code signing on Xcode 6. Other iOS target types do too. Until CMake learns to add the CODE_SIGN_IDENTITY build attribute itself, toolchain files can set CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY to tell the Xcode generator to add the attribute. Teach CMakeDetermineCompilerId to recognize this variable and add the CODE_SIGN_IDENTITY build attribute to the compiler id project.
| * | | Xcode: Fix compiler id detection for iOS tools (#15214)Brad King2014-10-222-3/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0cce556b (Xcode: Use sysroot and deployment target to identify compiler, 2014-04-29) our compiler id detection project uses the target platform SDK in case Xcode selects a different compiler based on it. Now the compiler id project actually compiles with the target compiler and SDK when cross-compiling. The iOS tools do not support the 'com.apple.product-type.tool' product type we use in our compiler id detection project. When targeting iPhone, use product type 'com.apple.product-type.bundle.unit-test' instead.
* | | Merge topic 'doc-line-lengths'Brad King2014-10-2317-202/+279
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80b19a71 Help/manual: Avoid long lines in code blocks 4fdacedc Help: Clarify formatting of CPACK_WIX_ACL documentation 35ca4863 Help: Wrap long ctest_submit signature line 58b2d760 Modules: Format documentation to avoid over-long preformatted lines
| * | | Modules: Format documentation to avoid over-long preformatted linesBrad King2014-10-2217-202/+279
| |/ / | | | | | | | | | | | | | | | Convert several preformatted code block literals that enumerate lists of options or variables to use reST definition lists instead. Manually wrap other long lines in code blocks.
* | | Merge topic 'FindHg-no-cygwin-hg-on-windows'Brad King2014-10-221-0/+4
|\ \ \ | | | | | | | | | | | | | | | | ed997de4 FindHg: Do not use cygwin hg on Windows
| * | | FindHg: Do not use cygwin hg on WindowsBrad King2014-10-221-0/+4
| |/ / | | | | | | | | | | | | The cygwin hg client is a text file with a '#!/bin/python" line. This cannot run on Windows.
* | | Merge topic 'cuda-rpath-osx'Brad King2014-10-221-12/+0
|\ \ \ | | | | | | | | | | | | | | | | 59814cb4 FindCUDA: Remove rpath logic outdated by CMake's own @rpath support
| * | | FindCUDA: Remove rpath logic outdated by CMake's own @rpath supportClinton Stimpson2014-10-221-12/+0
| |/ / | | | | | | | | | | | | Otherwise binaries end up with two copies of the same value and the OS X install_name_tool may corrupt them.
* | | Merge topic 'fix-OSX-bundle-rpaths-and-Qt5'Brad King2014-10-221-2/+16
|\ \ \ | | | | | | | | | | | | | | | | 41564ff2 BundleUtilities: Ensure framework symlinks and Info.plist exist
| * | | BundleUtilities: Ensure framework symlinks and Info.plist existAdam Strzelecki2014-10-211-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This restores Qt SDK 4.8 and OS X >= 10.6.5 codesign compatibility improving embedding frameworks using correct bundle layout described at: https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html 1. If Versions/VERSION/Resources/Info.plist is missing, well known incorrect locations are checked for Info.plist and Info.plist is copied from there, otherwise codesign will fail. 2. Root framework symlinks to binary and Resources are restored to point inside Versions/Current, otherwise Qt 4.8 looking for Resources/ in framework root will fail.
* | | | Merge topic 'cpack-rpm-component-descriptions'Brad King2014-10-221-11/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 603ef7fd CPackRPM: Add component based packaging description and summary
| * | | | CPackRPM: Add component based packaging description and summaryDomen Vrankar2014-10-211-11/+67
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable per-component description and summary setting through CPACK_RPM_<component>_PACKAGE_DESCRIPTION, CPACK_COMPONENT_<compName>_DESCRIPTION and CPACK_RPM_<component>_PACKAGE_SUMMARY variables. Extend the CPackComponentsForAll test to cover these.
* | | | Merge topic 'cmake-cmp0054-warnings'Brad King2014-10-219-21/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 29c3edb8 Avoid if() quoted auto-dereference
| * | | | Avoid if() quoted auto-dereferenceBen Boeckel2014-10-209-21/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | When testing CMAKE_<LANG>_COMPILER_ID values, do not explicitly dereference or quote the variable. We want if() to auto-dereference the variable and not its value. Also replace MATCHES with STREQUAL where equivalent.
* | | | Merge topic 'UseJava-classpath-cross-compile'Brad King2014-10-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7a373d5e UseJava: Fix classpath separator on WIN32 cross compilation (#15206)
| * | | | UseJava: Fix classpath separator on WIN32 cross compilation (#15206)Lorenz Witte2014-10-141-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The condition to use ";" as classpath separator includes a check for the switch "WIN32" which is a target switch. When cross-compiling for a non-windows target, this switch is not present and the separator defaults to ":". It should check for "CMAKE_HOST_WIN32" instead.
* | | | Merge topic 'UseSWIG-r-support'Brad King2014-10-211-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 9de113a9 UseSWIG: Fix R module prefix
| * | | UseSWIG: Fix R module prefixJulien Schueller2014-10-141-0/+2
| | |/ | |/|
* | | CheckStructHasMember: avoid breakage on -Wall -Werror (#15203)Peter Wu2014-10-131-1/+1
|/ / | | | | | | | | With CMAKE_C_FLAGS='-Wall -Werror', this test breaks due to -Werror=unused-value. Fix this by ignoring the return value.
* | Merge topic 'fix-OSX-bundle-rpaths-and-Qt5'Brad King2014-10-102-32/+141
|\ \ | |/ | | | | | | | | | | | | | | | | | | 631fadea Help: Add notes for topic 'fix-OSX-bundle-rpaths-and-Qt5' 50e261dd OSX: Warn when attempting to change runtime paths on OS X 10.5 9b98fd52 cmake-gui: Make sure we bundle Qt5 Cocoa platform plugin 83a06bb4 BundleUtilities: Framework codesign Resources/Info.plist & Current f7df82ac BundleUtilities: Resolve & replace @rpath placeholders 14bc686f GetPrerequisites: Make sure dyld placeholders are prefixes 6c313797 BundleUtilities: Use find on UNIX for fast executable lookup
| * BundleUtilities: Framework codesign Resources/Info.plist & CurrentAdam Strzelecki2014-10-101-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | We need to ensure copied framework has proper layout with Resources/Info.plist present next to versioned binary and Current symlink in Versions: https://developer.apple.com/library/mac/technotes/tn2206 https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html If Resources/ is not present we may try to copy Contents/Info.plist if present to embedded Resources/Info.plist. This is a case of Qt5 that has obsolete/invalid framework layout (see QTBUG-38511).
| * BundleUtilities: Resolve & replace @rpath placeholdersAdam Strzelecki2014-10-102-26/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by gathering LC_RPATH commands for main bundle executable and using it for @rpath lookup in dependent frameworks. All functions that need to carry rpaths to now take optional <rpaths> argument. This enabled apps using @rpath to be bundled correctly, which will be necessary for upcoming Qt 5.4 that will use @rpath for all frameworks. Check that install_name_tool has -delete_rpath before using it. Otherwise it will fail with Xcode 3.x on 10.5 which has no -delete_rpath option for install_name_tool command, that was first introduced in 10.6 SDK, even that 10.5 supports LC_RPATH and @rpath.
| * GetPrerequisites: Make sure dyld placeholders are prefixesAdam Strzelecki2014-10-101-3/+3
| | | | | | | | | | Mac OS X dyld placeholders should be always prefixes, otherwise this can lead to some undefined behavior.
| * BundleUtilities: Use find on UNIX for fast executable lookupAdam Strzelecki2014-10-101-1/+19
| | | | | | | | | | | | | | | | | | | | | | It makes whole executable process quicker on UNIX, especially for large bundles containing many files, since using find narrows results to only files having executable flags then all further tests follow. Since find ... -perm +0111 is not clearly POSIX compliant and some Linux versions refuse it, it is better to use longer but portable: find ... -perm \( -perm -0100 -o -perm -0010 -o -perm -0001 \)
* | Merge topic 'FindThreads_overhaul'Brad King2014-10-091-36/+78
|\ \ | | | | | | | | | | | | | | | | | | b7e5c5a2 FindThreads: introduce THREADS_PREFER_PTHREAD_FLAG (#14767) bcb0e387 FindThreads: introduce an imported target to link to 46368edd FindThreads: move checking of the -pthread compiler flag into a macro
| * | FindThreads: introduce THREADS_PREFER_PTHREAD_FLAG (#14767)Rolf Eike Beer2014-10-081-0/+18
| | |
generated by cgit v0.12 at 2025-01-10 04:48:42 (GMT)