Commit Graph

20323 Commits

Author SHA1 Message Date
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
David Cole 6df05b93b1 Merge topic 'find_library-NAMES_PER_DIR'
66759ee find_library: Optionally consider all names in each directory
9cb68b1 find_library: Generalize helper macro in test case
b64dd76 find_library: Simplify framework search logic
531c71b find_library: Refactor internal name iteration
2012-10-31 16:32:41 -04:00
Rolf Eike Beer e496c54021 Linux/PA-RISC: Link with --unique=.text.* to help binutils
There is a binutils bug that leads to errors like this:

/usr/lib/gcc/hppa2.0-unknown-linux-gnu/4.6.3/../../../../hppa2.0-unknown-linux-gnu/bin/ld: libCMakeLib.a(cmTarget.cxx.o)(.text+0x12084): cannot reach 00001d28__ZNSspLEPKc@@GLIBCXX_3.4+0, recompile with -ffunction-sections
/usr/lib/gcc/hppa2.0-unknown-linux-gnu/4.6.3/../../../../hppa2.0-unknown-linux-gnu/bin/ld: libCMakeLib.a(cmTarget.cxx.o)(.text+0x12084): cannot handle R_PARISC_PCREL17F for std::basic_string<char, std::char_traits<char>, std::allocator<char> >::operator+=(char const*)@@GLIBCXX_3.4
/usr/lib/gcc/hppa2.0-unknown-linux-gnu/4.6.3/../../../../hppa2.0-unknown-linux-gnu/bin/ld: final link failed: Bad value

Until someone finds out what needs to be fixed in binutils this allows anyone
to compile a working CMake even in debug mode.
2012-10-31 16:28:51 -04:00
Clinton Stimpson 4374441f3f PackageMaker: Enable postflight script in component mode (#12375)
Previously, setting CPACK_POSTFLIGHT_SCRIPT had no effect in
component mode, when CPACK_COMPONENTS_ALL was set.

In component mode, a .mpkg is created that contains multiple .pkg's.
Because postflight scripts only work in a .pkg, add another .pkg to the
.mpkg and put the postflight script in that.
This is the same approach taken by the PackageMaker GUI when adding
a postflight script to a metapackage.
2012-10-31 16:23:48 -04:00
Rolf Eike Beer d1f3bfe50e Tests: add MajorVersionSelection tests
For things where we may have 2 major versions of the same software
installed in parallel (think of Qt and Python) make sure our version
selection gets this right.
2012-10-31 16:22:42 -04:00
David Cole c3b82f6770 Begin post-2.8.10 development 2012-10-31 15:03:16 -04:00
David Cole c36622a45f CMake 2.8.10 2012-10-31 10:59:55 -04:00
David Cole a7742140ad Merge branch 'release' 2012-10-31 10:56:08 -04:00
Kitware Robot 29b0d5c734 CMake Nightly Date Stamp 2012-10-31 00:01:02 -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
Kitware Robot b518f2262b CMake Nightly Date Stamp 2012-10-30 00:01:11 -04:00
Kitware Robot 2c8286e04f CMake Nightly Date Stamp 2012-10-29 00:01:08 -04:00
Kitware Robot abe4edfad3 CMake Nightly Date Stamp 2012-10-28 00:01:09 -04:00
Kitware Robot 4322816b6b CMake Nightly Date Stamp 2012-10-27 00:01:12 -04:00
Brad King 035e7bd04e VS10: Honor /DELAYSIGN and /KEYFILE flags (#13601)
Fix the VS 10 link flag map to name the project file entries correctly.
The VS 11 link flag map already has the correct names.  Generate the
entries in the <PropertyGroup> along with incremental linking options.
Drop them from the <Link> element because VS does not use them.
2012-10-26 11:02:42 -04:00
Brad King c65a2ea6a8 VS10: Refactor link options collection
Avoid collecting the link options twice.  Collect them once in a
LinkOptions member and use it from both places.  We already do this for
compiler options with the ClOptions member.
2012-10-26 10:16:45 -04:00
Brad King ed9763136a Optionally skip link dependencies on shared library files
Add target property LINK_DEPENDS_NO_SHARED and initialization variable
CMAKE_LINK_DEPENDS_NO_SHARED to enable this behavior.

Suggested-by: Leif Walsh <leif.walsh@gmail.com>
2012-10-26 08:28:16 -04:00
Kitware Robot b2c631c7c8 CMake Nightly Date Stamp 2012-10-26 00:01:04 -04:00
Brad King 0e3f95eff9 Merge branch 'upstream-kwiml' into update-KWIML 2012-10-25 07:54:49 -04:00
Thomas Klausner 415623581d KWIML: Teach ABI.h that VAX is big endian 2012-10-25 07:53:32 -04:00
Kitware Robot 259cff94ff CMake Nightly Date Stamp 2012-10-25 00:01:06 -04:00
David Cole d7de6410dd VS: Avoid empty, unreferenced solution folders... (#13571)
...in generated sub-directory sln files.

Thanks to rlandert for the bug report and proposed patch.

The method WriteTargetsToSolution gets called possibly multiple times,
once per sln file, (-> once per "project" command).

Before accumulating folder names in VisualStudioFolders, clear it
first, so it doesn't have stale entries in it from the previous
sln file.
2012-10-24 14:27:06 -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
Brad King 388a3216fc Xcode: Fix ReRunCMake.make path to cmake.check_cache (#13603)
The path must be either absolute or relative to the working directory
from which the makefile will be loaded.  In subprojects this is not
relative to the top of the build tree.

Reported-by: David Weese <tre@gmx.de>
2012-10-24 14:13:19 -04:00
David Cole 52cd8e83d4 CMake 2.8.10-rc3 2012-10-24 11:43:00 -04:00
David Cole 4bda4b1c1c Merge branch 'release' 2012-10-24 11:40:33 -04:00
Kitware Robot f551fa6245 CMake Nightly Date Stamp 2012-10-24 00:01:07 -04: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 02b993b1ca Merge topic 'genex-validate-target-property-names'
e386992 GexEx: Validate Target names and property names differently.
95d590d GenEx: Create cmGeneratorTargets for imported targets.
0442104 GenEx: Add an accessor for imported targets in a makefile.
2012-10-23 16:37:56 -04:00
David Cole 2b5635ee23 Merge topic 'expand-LOCATION-documentation'
0cc00b0 Document LOCATION undefined behavior with use of LINKER_LANGUAGE.
2012-10-23 16:37:46 -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
David Cole 0276f4e9f4 Merge topic 'BasicConfigVersion-consistency'
dc0b0f6 BasicConfigVersion: Make docs refer to the macro, not the module name
2012-10-23 16:37:19 -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
Clinton Stimpson 14561e3d35 Fix for possible Rez errors when creating dmg.
Rez appears to have a limit on the length of lines it processes.
Break up long lines from a license file to avoid the error.
2012-10-22 23:06:16 -06:00
Kitware Robot 2362bc8e80 CMake Nightly Date Stamp 2012-10-23 00:01:05 -04:00
Stephen Kelly e386992152 GexEx: Validate Target names and property names differently.
In the unit test, use the same IMPORTED_LOCATION trick that
the ExportImport test uses.
2012-10-22 14:05:48 -04:00
Stephen Kelly 95d590ddba GenEx: Create cmGeneratorTargets for imported targets.
We're going to need to link to them, and all the linking API is moving
to cmGeneratorTarget.

Skip imported targets when iterating over cmGeneratorTargets in places
where we only want targets we build.  The GetGeneratorTargets result now
includes IMPORTED targets where it didn't before.  The GetTargets
result, which was what used to be called in these methods does not
include IMPORTED targets.  This doesn't relate to any known bugs, but in
some future uses of GetGeneratorTargets it will be important, so
starting the convention and being deliberate now is a good idea.
2012-10-22 14:03:51 -04:00
Stephen Kelly 04421042b3 GenEx: Add an accessor for imported targets in a makefile. 2012-10-22 14:01:35 -04:00
Stephen Kelly 0cc00b06d8 Document LOCATION undefined behavior with use of LINKER_LANGUAGE. 2012-10-22 13:59:04 -04:00
Kitware Robot 9c42e9831d CMake Nightly Date Stamp 2012-10-22 00:01:04 -04:00
Rolf Eike Beer a22f4fabb7 SelectLibraryConfigurations: fix for release and debug libs being the same 2012-10-21 15:24:25 +02:00
Rolf Eike Beer 5052fbc93d SelectLibraryConfigurations: add testcase 2012-10-21 15:17:20 +02:00
Kitware Robot df5c1db8c0 CMake Nightly Date Stamp 2012-10-21 00:01:05 -04:00
Stephen Kelly 4bacff7a4c GenEx: Test early determination of AND and OR
It should be possible for example to do this:

 "$<AND:${FOO},$<BOOL:${TGT}>,$<BOOL:$<TARGET_PROPERTY:${TGT},PROP>"

such that it works simliarly to the C code:

 if (foo && tgt && tgt->prop())
   {
   }

The example of generator expression code is a little bit contrived as
it could be written other ways with the same functionality. Nevertheless,
as these cases already work and are intentional, test for them.
2012-10-20 14:23:47 +02:00
Kitware Robot 62d58bf52c CMake Nightly Date Stamp 2012-10-20 00:01:05 -04: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