Commit Graph

4038 Commits

Author SHA1 Message Date
David Golub 51da766a6d CPack/NSIS: Fix compatibility issues with prerelease NSIS (#13202) 2012-11-19 19:53:29 -05:00
Brad King bd52ff3ac9 Merge topic 'only-git-fetch-when-necessary'
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.
2012-11-13 14:31:58 -05:00
Brad King b35ba02d52 Merge topic 'osx-bad-sdk-xcode-3.2.6'
720d790 OS X: Warn about known SDK breakage by Xcode 3.2.6
2012-11-13 14:31:37 -05:00
Brad King 10fd4c9352 Merge topic 'MakeSquish4Work'
b58fd65 Squish: fix new squish_v4_add_test() macro
2012-11-13 14:31:26 -05:00
Matt McCormick 9b66c8faf5 ExternalProject: Always do a git fetch for a remote ref.
Remote git refs always require a git fetch, because the remote may move around
where the ref points.
2012-11-13 13:34:43 -05:00
Brad King 720d790f16 OS X: Warn about known SDK breakage by Xcode 3.2.6
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>
2012-11-08 09:18:59 -05:00
Alex Neundorf b58fd6569a Squish: fix new squish_v4_add_test() macro
The OUTPUT_NAME target property only returns something if it has been
explicitely set. So use LOCATION, and extract the filename from that.

Alex
2012-11-07 17:48:53 +01:00
Brad King 4b3cb25876 Merge topic 'MakeSquish4Work'
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
2012-11-06 14:14:18 -05:00
Brad King 7fa265d79e Merge topic 'TI_DSP_Compiler'
65e9bbe Add support for Texas Instruments DSP compiler (#12405)
2012-11-06 14:14:08 -05:00
Brad King 31da7cce02 Merge topic 'fix-module-includes'
8ebf74b Find* (and some other): use ${CMAKE_CURRENT_LIST_DIR} in include()
2012-11-06 14:14:03 -05:00
Brad King a0074b64fc Merge topic 'deb-rpm-all_components_in_one'
e7e2694 CPack: Fix RPM/Deb package names to not include "ALL_COMPONENTS_IN_ONE"
2012-11-06 14:13:44 -05:00
Brad King b24ebfa157 Merge topic 'fix-13600-better-framework-regex'
89256e0 BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)
2012-11-06 14:13:28 -05:00
Brad King a574752f84 Merge topic 'osx-sysroot-cleanup'
15f5764 OS X: Fix default CMAKE_OSX_SYSROOT with deployment target
2012-11-06 14:13:22 -05:00
Brad King 688631a43b Merge topic 'fix-FindSDL-paths'
7cb5173 FindSDL: Restore accidentally dropped search paths (#13651)
2012-11-06 14:13:18 -05:00
Brad King 6991013ddb Merge topic 'fix-PathScale-compiler-id'
fccf19f Fix PathScale compiler id for Clang-based upstream
2012-11-06 14:12:58 -05:00
Brad King 163802e8a1 Merge topic 'fix-openssl-win'
4a4c0ee FindOpenSSL: also find the non-MD debug libraries for MSVC
894b775 FindOpenSSL: fix library selection on Windows (#13645)
2012-11-06 14:12:54 -05:00
Clinton Stimpson e7e2694823 CPack: Fix RPM/Deb package names to not include "ALL_COMPONENTS_IN_ONE" 2012-11-06 11:50:07 -05:00
Brad King f058b27547 Merge branch 'osx-sysroot-cleanup' into release 2012-11-06 11:21:55 -05:00
Brad King 511f227e13 Merge branch 'fix-FindSDL-paths' into release 2012-11-06 11:21:49 -05:00
Brad King 7998ede985 Merge branch 'fix-PathScale-compiler-id' into release 2012-11-06 11:21:25 -05:00
Alex Neundorf 3a0ffa6225 Squish: add support for squish 4 (#9734)
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
2012-11-05 19:20:13 +01:00
Alex Neundorf 2ae9d03fa6 Squish: use ${CMAKE_CURRENT_LIST_DIR}
Use ${CMAKE_CURRENT_LIST_DIR} instead of constructing the dir from pieces.

Alex
2012-11-05 19:17:24 +01:00
Alex Neundorf 53c42cb4ea Squish: rename squish_add_test() to squish_v3_add_test() and fix docs a bit
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
2012-11-05 19:17:20 +01:00
Brad King 15f5764e2c OS X: Fix default CMAKE_OSX_SYSROOT with deployment target
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>
2012-11-05 10:47:33 -05:00
Brad King 7cb5173969 FindSDL: Restore accidentally dropped search paths (#13651)
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>
2012-11-05 09:47:09 -05:00
Brad King fccf19f49b Fix PathScale compiler id for Clang-based upstream
Upstream PathScale now uses Clang as its front-end.  Test for __PATHCC__
before __clang__.

Reported-by: C. Bergström <cbergstrom@pathscale.com>
2012-11-05 08:33:54 -05:00
Rolf Eike Beer 4a4c0ee780 FindOpenSSL: also find the non-MD debug libraries for MSVC
We already search for them in release mode.
2012-11-05 08:17:02 -05:00
Rolf Eike Beer 894b775fa7 FindOpenSSL: fix library selection on Windows (#13645) 2012-11-05 08:17:02 -05:00
Alex Neundorf daf1c4d5a7 Squish: find executables also under Windows
This is required according to Volker Krause
(see http://public.kitware.com/Bug/view.php?id=9734)

Alex
2012-11-04 19:25:43 +01:00
Alex Neundorf b878cd6fb4 Squish: use FPHSA
Alex
2012-11-04 19:22:27 +01:00
Alex Neundorf 3fe2bc622e Squish: detect version
Alex
2012-11-04 19:19:40 +01:00
Alex Neundorf 65e9bbe78e Add support for Texas Instruments DSP compiler (#12405)
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
2012-11-04 15:46:57 +01:00
Rolf Eike Beer 8ebf74b02f Find* (and some other): use ${CMAKE_CURRENT_LIST_DIR} in include()
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
2012-11-04 05:55:37 +01:00
Matt McCormick d0758290e7 ExternalProject: Only run 'git fetch' when required.
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.
2012-11-03 17:18:14 -04:00
David Cole 99c95d5e1a Merge topic 'doc-external-language-policy'
854369f Document external language support policy
2012-10-31 16:35:31 -04:00
David Cole 2c3bfb6876 Merge topic 'FindQt-version-selection'
041fb29 FindQt: add some more places to look for Qt3
7bb9395 FindQt: improve version selection
2012-10-31 16:34:20 -04:00
David Cole 0b9dac6cbc Merge topic 'EclipseNoLinkedResources'
fbda958 Eclipse: add switch to disable linked resources (#13189)
2012-10-31 16:33:36 -04:00
David Cole af304a1c6a Merge topic 'FindIcotool'
86a184d Add module FindIcotool
2012-10-31 16:33:15 -04:00
David Cole 0f2735019a Merge topic 'simplify-FreeBSD-shared'
6f68ef4 BSD: Do not require dlfcn.h to build shared libs (#13573)
2012-10-31 16:33:06 -04:00
David Cole 634c8bf49f Merge topic 'FindBoost-cleanup'
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
2012-10-31 16:32:52 -04:00
Brad King 854369fd45 Document external language support policy
Describe in "Modules/CMakeAddNewLanguage.txt" our policy for external
language support.
2012-10-30 14:02:46 -04:00
Rolf Eike Beer 041fb29bd7 FindQt: add some more places to look for Qt3
Qt3 may be e.g. in /usr/lib64/qt-3 or in /usr/lib/qt3, too.
2012-10-24 20:19:54 +02:00
Rolf Eike Beer 7bb9395974 FindQt: improve version selection
-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
2012-10-24 20:19:50 +02:00
David Cole 89256e03cf BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)
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.
2012-10-23 18:10:28 -04:00
David Cole 23a257628b Merge topic 'test-SelectLibraryConfigurations'
a22f4fa SelectLibraryConfigurations: fix for release and debug libs being the same
5052fbc SelectLibraryConfigurations: add testcase
2012-10-23 16:37:37 -04:00
David Cole c26373f6ca Merge topic 'fix-SelectLibraryConfigurations-regression'
1cd2ec1 SelectLibraryConfigurations: Fix foreach(x IN LISTS ...) syntax
2012-10-23 16:37:28 -04:00
Stephen Kelly dc0b0f6b6d BasicConfigVersion: Make docs refer to the macro, not the module name
The -ExactVersion variant already refers to the macro, and I think
it makes more sense anyway.
2012-10-23 11:08:34 -04:00
Rolf Eike Beer a22f4fabb7 SelectLibraryConfigurations: fix for release and debug libs being the same 2012-10-21 15:24:25 +02:00
Thomas Arcila 1cd2ec1072 SelectLibraryConfigurations: Fix foreach(x IN LISTS ...) syntax
In commit 5797512c (SelectLibraryConfiguration: generate correct output
when input vars are lists, 2012-07-28) the "IN" keyword was left out.
2012-10-19 13:47:26 -04:00
Alex Neundorf fbda95883c Eclipse: add switch to disable linked resources (#13189)
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
2012-10-17 23:45:02 +02:00