summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'only-git-fetch-when-necessary'Brad King2012-11-131-5/+78
|\ | | | | | | | | | | | | | | | | | | | | a41d3a4 ExternalProjectUpdateTest: Only support Git 1.6.5 and greater. de760c1 ExternalProject: Verify when a fetch occurs during update test. 0a34433 ExternalProject: Make sure the ExternalProjectUpdate setup is available. 9b66c8f ExternalProject: Always do a git fetch for a remote ref. 2619f4d ExternalProject: Add tests for UPDATE_COMMAND. 378aa12 ExternalProject: Do smoke tests for Git Tutorial builds. d075829 ExternalProject: Only run 'git fetch' when required.
| * ExternalProject: Always do a git fetch for a remote ref.Matt McCormick2012-11-131-1/+14
| | | | | | | | | | Remote git refs always require a git fetch, because the remote may move around where the ref points.
| * ExternalProject: Only run 'git fetch' when required.Matt McCormick2012-11-031-5/+65
| | | | | | | | | | | | | | | | | | | | | | In the current default update step for Git under the ExternalProject_Add command, a 'git fetch' is always performed, followed by a 'git checkout' and 'git submodule update --recursive'. However, a 'git fetch' can be time consuming and requires a network connection. To save time, we look at the current checked out hash, and only perform the fetch if required. This is performed in a CMake script so we can handle the conditional logic in a cross platform manner.
* | Merge topic 'osx-bad-sdk-xcode-3.2.6'Brad King2012-11-131-0/+17
|\ \ | | | | | | | | | | | | 720d790 OS X: Warn about known SDK breakage by Xcode 3.2.6
| * | OS X: Warn about known SDK breakage by Xcode 3.2.6Brad King2012-11-081-0/+17
| | | | | | | | | | | | | | | | | | | | | Xcode 3.2.6 is known to break the SDK Library/Frameworks layout. Detect and warn about this case to tell users to fix their system. Reported-by: Matthew Brett <matthew.brett@gmail.com>
| * | Merge branch 'osx-sysroot-cleanup' into releaseBrad King2012-11-061-0/+1
| |\ \
| * \ \ Merge branch 'fix-FindSDL-paths' into releaseBrad King2012-11-061-1/+2
| |\ \ \
| * \ \ \ Merge branch 'fix-PathScale-compiler-id' into releaseBrad King2012-11-062-16/+16
| |\ \ \ \
* | \ \ \ \ Merge topic 'MakeSquish4Work'Brad King2012-11-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b58fd65 Squish: fix new squish_v4_add_test() macro
| * | | | | | Squish: fix new squish_v4_add_test() macroAlex Neundorf2012-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OUTPUT_NAME target property only returns something if it has been explicitely set. So use LOCATION, and extract the filename from that. Alex
* | | | | | | Merge topic 'MakeSquish4Work'Brad King2012-11-064-29/+234
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a0ffa6 Squish: add support for squish 4 (#9734) 2ae9d03 Squish: use ${CMAKE_CURRENT_LIST_DIR} 53c42cb Squish: rename squish_add_test() to squish_v3_add_test() and fix docs a bit daf1c4d Squish: find executables also under Windows b878cd6 Squish: use FPHSA 3fe2bc6 Squish: detect version
| * | | | | | Squish: add support for squish 4 (#9734)Alex Neundorf2012-11-054-20/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for Squish 4.x. The changes are basically what is attached to http://public.kitware.com/Bug/view.php?id=9734. When adding a test for squish 4.x, use squish_v4_add_test(). Alex
| * | | | | | Squish: use ${CMAKE_CURRENT_LIST_DIR}Alex Neundorf2012-11-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ${CMAKE_CURRENT_LIST_DIR} instead of constructing the dir from pieces. Alex
| * | | | | | Squish: rename squish_add_test() to squish_v3_add_test() and fix docs a bitAlex Neundorf2012-11-051-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is still a wrapper macro squish_add_test(), but this now mentions that you should use squish_v3_add_test() instead. Also, the docs for the macro were just wrong. They are at least correct now, but still hard to understand (I don't have squish 3 around, so I can't improve them). Alex
| * | | | | | Squish: find executables also under WindowsAlex Neundorf2012-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required according to Volker Krause (see http://public.kitware.com/Bug/view.php?id=9734) Alex
| * | | | | | Squish: use FPHSAAlex Neundorf2012-11-041-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | Squish: detect versionAlex Neundorf2012-11-041-0/+19
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Alex
* | | | | | Merge topic 'TI_DSP_Compiler'Brad King2012-11-063-0/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65e9bbe Add support for Texas Instruments DSP compiler (#12405)
| * | | | | | Add support for Texas Instruments DSP compiler (#12405)Alex Neundorf2012-11-043-0/+28
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for the cl6x compiler from TI, which is used for TI DSPs. The toolchain can be downloaded for free for Linux and Windows. Alex
* | | | | | Merge topic 'fix-module-includes'Brad King2012-11-0653-65/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ebf74b Find* (and some other): use ${CMAKE_CURRENT_LIST_DIR} in include()
| * | | | | | Find* (and some other): use ${CMAKE_CURRENT_LIST_DIR} in include()Rolf Eike Beer2012-11-0453-65/+65
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves a lots of warnings, e.g. in the FindModulesExecuteAll test. If the installed version on the system is rather old this may even lead to bugs, e.g. https://bugs.gentoo.org/show_bug.cgi?id=436540
* | | | | | Merge topic 'deb-rpm-all_components_in_one'Brad King2012-11-062-8/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7e2694 CPack: Fix RPM/Deb package names to not include "ALL_COMPONENTS_IN_ONE"
| * | | | | | CPack: Fix RPM/Deb package names to not include "ALL_COMPONENTS_IN_ONE"Clinton Stimpson2012-11-062-8/+4
| | | | | | |
* | | | | | | Merge topic 'fix-13600-better-framework-regex'Brad King2012-11-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89256e0 BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)
| * | | | | | | BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)David Cole2012-10-231-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some frameworks might be built with the library right at the root of the framework rather than down in a versioned sub-folder with a symlink at the root. Make one of the slashes in the REGEX optional so BundleUtilities can still properly work with such frameworks ... even if they are weird. ;-) Thanks to Tobias Hieta for the bug report and for trying out the fix before I pushed this commit.
* | | | | | | Merge topic 'osx-sysroot-cleanup'Brad King2012-11-061-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 15f5764 OS X: Fix default CMAKE_OSX_SYSROOT with deployment target
| * | | | | | OS X: Fix default CMAKE_OSX_SYSROOT with deployment targetBrad King2012-11-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 43b74793 (OS X: Further improve default CMAKE_OSX_SYSROOT selection, 2012-09-21) we choose a default CMAKE_OSX_SYSROOT only when one is needed. However, the change forgot that we require a sysroot when a deployment target is requested. Teach Darwin.cmake to choose a default CMAKE_OSX_SYSROOT when CMAKE_OSX_DEPLOYMENT_TARGET is set. Reported-by: Matthew Brett <matthew.brett@gmail.com> Reported-by: Bradley Giesbrecht <pixilla@macports.org>
* | | | | | | Merge topic 'fix-FindSDL-paths'Brad King2012-11-061-1/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 7cb5173 FindSDL: Restore accidentally dropped search paths (#13651)
| * | | | | | FindSDL: Restore accidentally dropped search paths (#13651)Brad King2012-11-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup in commit 9ed24c53 (FindSDL: Remove from find_... calls PATHS that are set by default, 2012-09-04) accidentally dropped some search paths. Restore the dropped PATH_SUFFIXES and add more suffixes needed to search paths that were previously hard-coded. Reported-by: Gino van den Bergen <gino@dtecta.com>
* | | | | | | Merge topic 'fix-PathScale-compiler-id'Brad King2012-11-062-16/+16
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | fccf19f Fix PathScale compiler id for Clang-based upstream
| * | | | | | Fix PathScale compiler id for Clang-based upstreamBrad King2012-11-052-16/+16
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream PathScale now uses Clang as its front-end. Test for __PATHCC__ before __clang__. Reported-by: C. Bergström <cbergstrom@pathscale.com>
* | | | | | Merge topic 'fix-openssl-win'Brad King2012-11-061-0/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | | | | | 4a4c0ee FindOpenSSL: also find the non-MD debug libraries for MSVC 894b775 FindOpenSSL: fix library selection on Windows (#13645)
| * | | | FindOpenSSL: also find the non-MD debug libraries for MSVCRolf Eike Beer2012-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | We already search for them in release mode.
| * | | | FindOpenSSL: fix library selection on Windows (#13645)Rolf Eike Beer2012-11-051-0/+5
| |/ / /
* | | | Merge topic 'doc-external-language-policy'David Cole2012-10-311-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 854369f Document external language support policy
| * | | | Document external language support policyBrad King2012-10-301-0/+16
| |/ / / | | | | | | | | | | | | | | | | Describe in "Modules/CMakeAddNewLanguage.txt" our policy for external language support.
* | | | Merge topic 'FindQt-version-selection'David Cole2012-10-311-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 041fb29 FindQt: add some more places to look for Qt3 7bb9395 FindQt: improve version selection
| * | | | FindQt: add some more places to look for Qt3Rolf Eike Beer2012-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | Qt3 may be e.g. in /usr/lib64/qt-3 or in /usr/lib/qt3, too.
| * | | | FindQt: improve version selectionRolf Eike Beer2012-10-241-3/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | -make "find_package(Qt 3)" work -if DESIRED_QT_VERSION was set, but only the other Qt major version was found don't override the DESIRED_QT_VERSION set by the user
* | | | Merge topic 'EclipseNoLinkedResources'David Cole2012-10-311-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fbda958 Eclipse: add switch to disable linked resources (#13189)
| * | | | Eclipse: add switch to disable linked resources (#13189)Alex Neundorf2012-10-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse may get confused by these linked resources, because it sees the same source file multiple times then and doesn't recognize that it's the same file actually. Alex
* | | | | Merge topic 'FindIcotool'David Cole2012-10-311-0/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 86a184d Add module FindIcotool
| * | | | | Add module FindIcotoolAleksey Avdeev2012-10-161-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module looks for icotool. Signed-off-by: Aleksey Avdeev <solo@altlinux.ru>
* | | | | | Merge topic 'simplify-FreeBSD-shared'David Cole2012-10-312-26/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f68ef4 BSD: Do not require dlfcn.h to build shared libs (#13573)
| * | | | | | BSD: Do not require dlfcn.h to build shared libs (#13573)Brad King2012-10-052-26/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ancient checks left from commit f5d95fb0 (Complete rework of makefile generators expect trouble, 2002-11-08). Modern FreeBSD and NetBSD platforms support shared libraries. When cross-compiling the /usr/include/dlfcn.h may not exist on the host but the toolchain still supports shared libraries.
* | | | | | | Merge topic 'FindBoost-cleanup'David Cole2012-10-311-813/+748
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0496782 FindBoost: Rewrite documentation 4d92f6c FindBoost: Refactor Boost_FOUND computation and version check 0100f88 FindBoost: Construct a clean Boost_LIBRARIES value 5b9149e FindBoost: Overhaul caching and search repeat behavior 5ec8a69 FindBoost: Use PATH_SUFFIXES to look in "Program Files" d3260a4 FindBoost: Mark Boost_DIR cache entry as advanced 531612d FindBoost: Remove extra indentation level
| * | | | | | FindBoost: Rewrite documentationBrad King2012-09-271-242/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write new documentation for this module. Ensure that it formats correctly in "cmake --help-module FindBoost" output. Show the basic form of calling find_package(Boost). Document all result variables, input variables, and cache variables appropriately grouped together. Explain the search process and how it re-runs when changes are made. Explain the difference between finding headers/libraries versus finding a "Boost CMake" package configuraiton file. Drop the emphasis on Boost_ADDITIONAL_VERSIONS because the implementation should predict most future versions instead.
| * | | | | | FindBoost: Refactor Boost_FOUND computation and version checkBrad King2012-09-271-98/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Construct an initial Boost_FOUND value immediately after searching for Boost_INCLUDE_DIR. Base the result only on whether header files for the requested version were found. Then after searching for component libraries update Boost_FOUND based on whether all requested components were found.
| * | | | | | FindBoost: Construct a clean Boost_LIBRARIES valueBrad King2012-09-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Construct the value from scratch based on the component library list. Avoid accumulating values from repeated find_package(Boost) calls. If Boost is not found, Boost_LIBRARIES should be empty.
| * | | | | | FindBoost: Overhaul caching and search repeat behaviorBrad King2012-09-271-128/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overhaul the implementation as follows: (1) Do not cache result variables such as Boost_VERSION, Boost_LIB_VERSION, Boost_LIBRARY_DIRS, Boost_${COMPONENT}_FOUND, Boost_${COMPONENT}_LIBRARY, or Boost_LIB_DIAGNOSTIC_DEFINITIONS that are derived uniquely from other search results. The user should not edit them anyway. (2) Add cache value Boost_LIBRARY_DIR to hold the single directory expected to contain all libraries. Once one library is found, search only that directory for other libraries. (3) Use the find_library NAMES_PER_DIR option to consider all possible library names at the same time. (4) Collect all documented input and cache variables and detect when they have been changed by the user. Discard prior search results that may have been influenced by the changes and search for them again. Environment variables are not expected to be persistent so use them only as hints and do not consider changes to them to be meaningful.