Brad King
7998ede985
Merge branch 'fix-PathScale-compiler-id' into release
2012-11-06 11:21:25 -05:00
Brad King
d6ab875260
Merge branch 'fix-openssl-win' into release
2012-11-06 11:21:17 -05:00
Brad King
719438fc27
Merge branch 'pdb-default-outdir' into release
2012-11-06 11:20:50 -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
Brad King
f309366873
Fix default PDB output directory ( #13644 )
...
The ComputePDBOutputDir added by commit 3f60dbf1
(Add
PDB_OUTPUT_DIRECTORY and PDB_NAME target properties, 2012-09-25) falls
back to the current binary directory instead of the target output
directory as before. When no PDB_OUTPUT_DIRECTORY property is set we
instead should fall back to the target output directory where .pdb files
used to go before the new property was added.
2012-11-02 12:49:44 -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
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
Kitware Robot
b2c631c7c8
CMake Nightly Date Stamp
2012-10-26 00:01:04 -04:00
Kitware Robot
259cff94ff
CMake Nightly Date Stamp
2012-10-25 00:01:06 -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
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
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
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
Kitware Robot
4c5db6ce6c
CMake Nightly Date Stamp
2012-10-19 00:01:04 -04:00
David Cole
f1189ee60e
CMake 2.8.10-rc2
2012-10-18 14:53:01 -04:00
David Cole
8830cf7f9e
Merge branch 'release'
2012-10-18 14:51:07 -04:00
Kitware Robot
2fb2a09c0e
CMake Nightly Date Stamp
2012-10-18 00:01:04 -04:00
David Cole
7ded904329
Merge topic 'refactor-CTestUseLaunchers'
...
d63eb0b
CTest: Ensure CTEST_USE_LAUNCHERS behaves nicely in Superbuild setup
2012-10-17 16:45:03 -04:00
David Cole
f3b8049884
Merge topic 'fix-INCLUDE_DIRECTORIES-multiconfig'
...
2a6bd96
Fix config-specific INCLUDE_DIRECTORIES in multi-config generators
2012-10-17 16:44:53 -04:00
David Cole
982905c0d2
Merge topic 'generator-expression-bug-fixes'
...
79edd00
GenEx: Fix reporting about not-found include directories and libraries.
f7ef32b
GenEx: Replace some failing tests with Borland and NMake makefiles.
fd59b10
GenEx: Add some more asserts to verify code-sanity.
6dd2b36
GenEx: Break if there are no more commas in the container
e7230c7
GenEx: Fix termination bugs in generator expression parser.
145a4af
GenEx: Test the use of generator expressions to generate lists.
e2d141d
GenEx: Parse colon after arguments separator colon specially.
2012-10-17 16:44:44 -04:00
David Cole
e8b1c1ffc0
Merge topic 'fix-13578-wrong-reg-key'
...
12c092c
NSIS: Fix incorrect uninstall registry key name (#13578 )
2012-10-17 16:44:33 -04:00
David Cole
0ef55608e6
Merge topic 'fix-postgres-debian'
...
4cbc1e5
Find PostgreSQL headers on Debian
2012-10-17 16:44:25 -04:00
David Cole
f7db7d735d
Merge topic 'AutomocFixDuplicatedFiles_13572'
...
3446cb5
Automoc: fix #13572 : issue with symbolic links
2012-10-17 16:44:14 -04:00
David Cole
7ff422fb8e
Merge topic 'CPack-ArchiveGen-andDESTIR_ON'
...
ddec053
Make CPACK_SET_DESTDIR work with archive generator + component-based packaging
2012-10-17 16:44:06 -04:00
David Cole
5ca2c49173
Merge topic 'fix-some-CPackDoc-typos'
...
2aad678
Document CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY and fix some typo.
2012-10-17 16:43:53 -04:00
David Cole
8bffb8451c
Merge topic 'Fix-XXX_ON_ABSOLUTE_INSTALL_DESTINATION-handling'
...
561b4ba
CPACK_XX_ON_ABSOLUTE_INSTALL_DESTINATION is now properly checked for ON/OFF
2012-10-17 16:43:44 -04:00
David Cole
a58cd0d7a4
Merge topic 'suncc-compile-fix'
...
a573a85
Attempt to fix the compile of cmake on Sun CC.
2012-10-17 16:43:36 -04:00