kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,202 Commits 1 Branch 14 Tags
Commit Graph

19202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Cole
92b11383d9 Merge topic 'SelectLibraryConfiguration-multi-lib-per-var2' 
5797512 SelectLibraryConfiguration: generate correct output when input vars are lists
 2012-08-13 13:27:39 -04:00
David Cole
11a9ea35de Merge topic 'FindOpenSSL-improve' 
3cfb68d FindOpenSSL: remove leftover comment
fc798ed FindOpenSSL: cleanup path hints
c78a7d1 FindOpenSSL: let CMake handle environment variable HINTS
7464519 FindOpenSSL: use SelectLibraryConfigurations
4b793ad FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431)
 2012-08-13 13:27:31 -04:00
David Cole
20f56a7eed Merge topic 'EclipseFixBadLinkedResources' 
4ea5dc5 Eclipse: fix #13358: don't create bad linked resources
 2012-08-13 13:27:17 -04:00
David Cole
1b9684562b Merge topic 'EclipseAddSupportForJuno' 
53cc102 Eclipse: improve (fix ?) version detection on OSX
bcccddc Eclipse: add support for the 4.2 Juno release (#13367)
 2012-08-13 13:27:07 -04:00
David Cole
85f843a7b4 Merge topic 'mixed-lib-to-lib64' 
af80da3 remove lib64 Unix paths if the respective lib path is also given
733726e find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419)
54add62 find_library: Simplify lib->lib<arch> expansion
6ca2f82 find_library: Refactor lib->lib64 conversion
1fe4b82 find_library: Add test covering lib->lib64 cases
 2012-08-13 13:26:57 -04:00
David Cole
e93d9c5c2b Merge topic 'use_normal_ouput_with_chdir' 
4ddd3b9 Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
 2012-08-13 13:26:48 -04:00
David Cole
e856509093 Merge topic 'release-script-fixes' 
214589b Add ability to run as a ctest -S script also
 2012-08-13 13:26:39 -04:00
David Cole
bed44c2cc1 Merge topic 'exclude-ExternalProject-test-for-cygwin-release-script' 
3a17311 Release: Temporarily exclude ExternalProject test on cygwin
 2012-08-13 13:26:30 -04:00
Kitware Robot
408c04e734 CMake Nightly Date Stamp 2012-08-13 00:01:02 -04:00
Kitware Robot
ee1ee20905 CMake Nightly Date Stamp 2012-08-12 00:01:02 -04:00
Kitware Robot
95e8636711 CMake Nightly Date Stamp 2012-08-11 00:01:02 -04:00
Kitware Robot
539cc289ba CMake Nightly Date Stamp 2012-08-10 00:01:04 -04:00
David Cole
b3b43a420d Begin post-2.8.9 development 2012-08-09 16:28:18 -04:00
David Cole
c462aafcfa CMake 2.8.9 2012-08-09 13:57:02 -04:00
David Cole
22d7094966 Merge branch 'release' 2012-08-09 13:54:45 -04:00
Kitware Robot
2c061d5cc9 CMake Nightly Date Stamp 2012-08-09 00:01:03 -04:00
Kitware Robot
121cc34d71 CMake Nightly Date Stamp 2012-08-08 00:01:05 -04:00
Kitware Robot
3bfabfa04a CMake Nightly Date Stamp 2012-08-07 00:01:04 -04:00
Kitware Robot
e2a57173df CMake Nightly Date Stamp 2012-08-06 00:01:02 -04:00
Kitware Robot
dc5b0b232b CMake Nightly Date Stamp 2012-08-05 00:01:07 -04:00
Kitware Robot
92bf48dd9e CMake Nightly Date Stamp 2012-08-04 00:01:10 -04:00
Kitware Robot
896524e13f CMake Nightly Date Stamp 2012-08-03 00:01:05 -04:00
Kitware Robot
33b7f583a5 CMake Nightly Date Stamp 2012-08-02 00:01:04 -04:00
Kitware Robot
5adfe691a9 CMake Nightly Date Stamp 2012-08-01 00:01:05 -04:00
Kitware Robot
aa3dbec57d CMake Nightly Date Stamp 2012-07-31 00:01:12 -04:00
Kitware Robot
8baeeed109 CMake Nightly Date Stamp 2012-07-30 00:01:06 -04:00
Rolf Eike Beer
5797512cec SelectLibraryConfiguration: generate correct output when input vars are lists 
In case that any of the input variables that hold the library names contains
more than just a single library the "debug" or "optimized" keywords were only
prepended to the first item, making all other libs appear in all
configurations. Just treat both input variables as lists.

Thanks to Philipp Berger <newsletters@philippberger.de> for pointing me at
this.
 2012-07-29 17:45:53 +02:00
Rolf Eike Beer
3cfb68d93e FindOpenSSL: remove leftover comment 2012-07-29 17:03:36 +02:00
Rolf Eike Beer
fc798ed64f FindOpenSSL: cleanup path hints 
-only use Windows-specific paths on Windows
-recode the contents of $ENV{PROGRAMFILES} to be a valid CMake path before
 using it
 2012-07-29 17:02:00 +02:00
Rolf Eike Beer
c78a7d11dd FindOpenSSL: let CMake handle environment variable HINTS 
This will automatically make sure the paths will get recoded to proper separators on Windows
 2012-07-29 16:53:39 +02:00
Rolf Eike Beer
7464519304 FindOpenSSL: use SelectLibraryConfigurations 2012-07-29 16:53:39 +02:00
Rolf Eike Beer
4b793ad196 FindOpenSSL: find cross-compiled OpenSSL from MinGW (#13431) 
Suggested-by: Dominik Schmidt <dev@dominik-schmidt.de>
 2012-07-29 16:53:39 +02:00
Kitware Robot
aedc2251fe CMake Nightly Date Stamp 2012-07-29 00:01:07 -04:00
Alex Neundorf
4ea5dc5ba5 Eclipse: fix #13358: don't create bad linked resources 
Don't create linked resources which point to CMAKE_BINARY_DIR
itself or one of its parent dirs. Eclipse complained about that.

Alex
 2012-07-28 18:42:47 +02:00
Alex Neundorf
53cc1026bc Eclipse: improve (fix ?) version detection on OSX 
This is probably related to a framework installation I guess.
This is part of the patch in #13367 from Nicholas Yue.

Alex
 2012-07-28 11:58:04 +02:00
Alex Neundorf
bcccddc7e9 Eclipse: add support for the 4.2 Juno release (#13367) 
Thanks for the path to Nicholas Yue.

Alex
 2012-07-28 11:40:08 +02:00
Kitware Robot
f66c82c8ac CMake Nightly Date Stamp 2012-07-28 00:01:02 -04:00
Kitware Robot
fb0bcc001c CMake Nightly Date Stamp 2012-07-27 00:01:07 -04:00
Kitware Robot
cac490aa70 CMake Nightly Date Stamp 2012-07-26 00:01:05 -04:00
David Cole
cda3626645 CMake 2.8.9-rc3 2012-07-25 11:25:40 -04:00
David Cole
78c83bc209 Merge branch 'release' 2012-07-25 11:24:39 -04:00
Kitware Robot
e5126cf405 CMake Nightly Date Stamp 2012-07-25 00:01:11 -04:00
David Cole
a51e1529e7 Merge topic 'ninja-fix-macosx' 
1fc8df9 Add missing this->.
7a3ecf5 Fix memory leak in Makefile generator.
9f7dc83 Ninja: also bootstrap ninja files
5d365b2 Ninja: enable ninja support everywhere
d569f3e Ninja: void function can't return a value
52160bf Ninja: enable ninja on Mac so all Mac CDash-builds are tested, cleanup later
56aeac6 Ninja: fixes for bcc
7a6bc9e Ninja: remove 'this' from member initializer list
44ba4cf Ninja: remove warnings
7751966 Ninja: remove 'friend' in ninja code
c3988ee Re-factor OS X content generator start up.
f8e0a51 Re-factor framework directory computation.
f36c7b0 Re-factor Mac OS X content directory computation.
5d885db Re-factor bundle content copying rules generation.
3b2a01e Ninja: Use same echo message as makefiles.
7bb56c5 Re-factor CFBundle generation.
...
 2012-07-24 17:03:46 -04:00
David Cole
c1bbdbff57 Merge topic 'DoNotInvokeCPackAtCMakeTime-forCMakeTests' 
b47cffa CPack: Use bin subdir when looking for dpkg and rpmbuild
a8c659c Find dpkg and rpmbuild in usual Fink and MacPort paths
848f220 Do not run cpack at CMake time it is not available.
 2012-07-24 17:03:37 -04:00
David Cole
d8627aa5b9 Merge topic 'fix-tests-for-gcc-4.7' 
b21cb9f Tests/ObjC++: Use standard <iostream> header
7fa8e53 Tests/X11: Add missing include <stdlib.h> for 'rand'
 2012-07-24 17:03:24 -04:00
David Cole
0f87f32fe3 Merge topic 'ninja-mingw-TARGET_PDB' 
9e30289 Ninja: Cannot pass a reference to an anonymous object.
0a3d6a1 Ninja: make debug symbol suffix configurable by CMAKE_DEBUG_SYMBOL_SUFFIX
75bbffb Ninja: make TARGET_PDB a real .gdb file name
e5a27a4 Ninja: line length
ae8124a Ninja: also mingw needs TARGET_PDB
 2012-07-24 17:03:13 -04:00
David Cole
a195ca98ba Merge topic 'ninja-mac-BuildDepends' 
207ec5c Ninja: fix mis-matching endif() argument
392a654 Ninja: on Mac no multiple -arch because of -M
801f23f Ninja: dep files and multiple -arch flags not possible on mac
 2012-07-24 17:03:00 -04:00
David Cole
d44ff1bea9 Merge topic 'findblas' 
79a4e2b Fixed: FindLAPACK does not find MKL 10.3 when using gcc 4.x
 2012-07-24 17:02:51 -04:00
David Cole
b5d9dba7b6 Merge topic 'ninja-cldeps-check-rc-result' 
74d1c88 Ninja: cmcldeps needs absolute paths for RCs
1cdeef7 Ninja: readd quotes to src file path before patching it
84a18cb Ninja: also stop when .rc's .d file couldn't be generated
 2012-07-24 17:02:31 -04:00
David Cole
e5fce89ea8 Merge topic 'ninja-rspfile-link-libraries' 
4259296 Ninja: fix sytle
3799848 Ninja: fix GCC 4.7 warning -Wconversion
 2012-07-24 17:02:21 -04:00