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
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
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
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
Rolf Eike Beer
af80da349b
remove lib64 Unix paths if the respective lib path is also given
...
If FIND_LIBRARY_USE_LIB64_PATHS is set both will be searched anyway.
2012-07-21 10:15:52 +02:00
Alexey Ozeritsky
79a4e2bbdd
Fixed: FindLAPACK does not find MKL 10.3 when using gcc 4.x
2012-07-18 11:17:45 +04:00
David Cole
58f5e77d6a
Merge topic 'ninja-rspfile-link-libraries'
...
4bb94c9
Ninja: sysconf() is declared in unistd.h
bb36759
Ninja: enable response file support on Mac (length 262144)
3a2c8e8
Ninja: disable work around when linking with mingw
3856e66
Ninja: error on missing rspfile_content
8c1e35c
Ninja: remove some unused default arguments
7f647cf
Ninja: also write link libraries to rsp file
2012-07-12 16:00:42 -04:00
David Cole
b1f6e688eb
Merge topic 'aix-gnu-asm'
...
7755283
Add ASM platform information for GNU compiler on AIX (#13390 )
2012-07-12 16:00:31 -04:00
David Cole
457041e5b3
Merge topic 'aix-GNU-shared-libs'
...
767a7ad
AIX-GNU: Link shared libs with -brtl,-bnoipath (#13352 )
2012-07-12 16:00:05 -04:00
David Cole
4b39302407
Merge topic 'deploy-qt4-workaround-bug-13258'
...
374b9b9
DeployQt4: workaround bug 13258 where ARGV1 is leaked into a sub function.
2012-07-12 15:59:43 -04:00
Peter Kümmel
3a2c8e8e66
Ninja: disable work around when linking with mingw
...
The work around is only needed by older GCCs (only testet 4.4/4.7)
Ninja is very new so chances are high that there is also a new mingw.
Use slashes in link rsp file, because ar.exe can't handle \.
2012-07-11 08:55:00 +02:00
Brad King
7755283e89
Add ASM platform information for GNU compiler on AIX ( #13390 )
...
Among other flags this sets RPATH flags correctly so that CMake knows
how to treat CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH for the ASM language.
This is the GNU compiler equivalent to commit a0bab7ae
(Add ASM platform
information for XL compiler on AIX, 2011-03-02), made for XL.
2012-07-10 15:18:55 -04:00
Brad King
767a7ad9da
AIX-GNU: Link shared libs with -brtl,-bnoipath ( #13352 )
...
We already use these flags with the XL toolchain. Use them for GNU too.
2012-07-09 17:18:41 -04:00
David Cole
cdc00f0f7e
Merge topic 'getprerequisites-pie-executables'
...
ac7a193
GetPrerequisites.cmake: detect executables built with the -pie linker flag.
2012-07-09 14:23:38 -04:00
David Cole
b636728e39
Merge topic 'CPack-honorCPACK_XXX-valuesInScriptFile'
...
05a8630
Do not provide defaul value for CPACK_PACKAGE_DIRECTORY if found in config.
2012-07-09 14:23:28 -04:00
David Cole
6d75da5f38
Merge topic 'FindBoostNotFoundBug'
...
ca90709
FindBoost: Future proof to 1.56
accd042
FindBoost: Fix bug where Boost_FOUND could be false when version specified
2012-07-09 14:23:09 -04:00
David Cole
88c31c9017
Merge topic 'EclipseFixIncludeDirDetectionMinGW'
...
d7bc8dd
Eclipse: fix #13313 , always set LANG to C, also if unset
2012-07-09 14:22:20 -04:00
Clinton Stimpson
374b9b9e74
DeployQt4: workaround bug 13258 where ARGV1 is leaked into a sub function.
2012-07-09 10:18:45 -06:00
Clinton Stimpson
ac7a193951
GetPrerequisites.cmake: detect executables built with the -pie linker flag.
2012-07-05 12:49:40 -06:00
Eric NOULARD
05a8630ee6
Do not provide defaul value for CPACK_PACKAGE_DIRECTORY if found in config.
...
This fixes bug #0012906 .
2012-07-04 23:08:32 +02:00
Philip Lowman
ca90709fd6
FindBoost: Future proof to 1.56
2012-06-30 03:40:37 -04:00
Philip Lowman
accd0428f4
FindBoost: Fix bug where Boost_FOUND could be false when version specified
...
Fixes a problem where when specifying a version number without the REQUIRED
parameter, Boost_FOUND would be true on the first configure but false on
subsequent configures.
2012-06-30 03:33:56 -04:00
Alex Neundorf
d7bc8dd6ea
Eclipse: fix #13313 , always set LANG to C, also if unset
...
Otherwise include dir detection does not work with MinGW on french systems.
Alex
2012-06-25 23:09:27 +02:00
Rolf Eike Beer
304562e7b5
FindJava: improve version matching ( #12878 )
2012-06-25 18:53:53 +02:00
David Cole
4042b50caa
Merge topic 'CMakeDetermineCCompiler-clear-init'
...
b9ccaf5
CMakeDetermineCCompiler: Fix typo "_CXX_" -> "_C_" (#13330 )
2012-06-21 11:55:34 -04:00
David Cole
fd8fc2791b
Merge topic 'qt4-macros'
...
0331a5a
Qt4Macros: add some quotes to prevent damage from spaces in the paths
f46903b
Qt4Macros: improve basename extraction in QT4_ADD_DBUS_INTERFACES
aa841ae
FindQt4: extend documentation
2012-06-21 11:55:24 -04:00
David Cole
14576fc096
Merge topic 'find-devil-doc-formatting'
...
af988e8
FindDevIL: clean up documentation formatting
2012-06-21 11:54:25 -04:00
David Cole
3948cb4fe4
Merge topic 'use-string-to-cmake-path'
...
3505e68
replace open coded versions of file(TO_CMAKE_PATH)
2012-06-21 11:54:14 -04:00
David Cole
934f553f85
Merge topic 'no-explicit-usr-search'
...
e93ac6f
do not explicitely specify /usr and /usr/local as search paths
2012-06-21 11:54:02 -04:00
Brad King
b9ccaf5f79
CMakeDetermineCCompiler: Fix typo "_CXX_" -> "_C_" ( #13330 )
...
Initialize CMAKE_C_COMPILER_INIT before using it, rather than
CMAKE_CXX_COMPILER_INIT.
2012-06-20 15:38:53 -04:00
Rolf Eike Beer
0331a5adde
Qt4Macros: add some quotes to prevent damage from spaces in the paths
2012-06-20 18:31:38 +02:00
Rolf Eike Beer
f46903b4b2
Qt4Macros: improve basename extraction in QT4_ADD_DBUS_INTERFACES
...
-convert the filename to lowercase before the extraction, this allows this to
work even if the filename as uppercase ".XML" extension
-use get_filename_component(... NAME) to strip the path
2012-06-20 18:31:37 +02:00
Rolf Eike Beer
aa841ae3f3
FindQt4: extend documentation
...
-refer to AUTOMOC from QT4_AUTOMOC
-mention how source file properties influence QT4_ADD_DBUS_INTERFACE
2012-06-20 18:31:37 +02:00
Rolf Eike Beer
af988e868c
FindDevIL: clean up documentation formatting
2012-06-19 21:09:42 +02:00
Rolf Eike Beer
3505e68466
replace open coded versions of file(TO_CMAKE_PATH)
2012-06-19 21:08:44 +02:00
Rolf Eike Beer
e93ac6fbfe
do not explicitely specify /usr and /usr/local as search paths
...
If not explicitely excluded these paths are searched automatically anyway.
2012-06-19 21:06:27 +02:00
Rolf Eike Beer
188b96b100
fix some typos
2012-06-19 21:05:14 +02:00
David Cole
3f8c9073f9
Merge topic 'CPackDeb-docUpdate'
...
5ac6ca0
CPackDeb add missing documentation for some CPACK_DEBIAN_xx variables.
2012-06-19 14:43:20 -04:00
David Cole
d3a61d1e0f
Merge topic 'FindBullet-LinearMath_Debug'
...
4393b3b
FindBullet: Add missing math library name (#13309 )
2012-06-19 14:42:51 -04:00
David Cole
565744bd3d
Merge topic 'ninja-cldeps'
...
eb410e8
Ninja: disable cldeps for bcc32, it's too old, and ninja would also not build
5ead31d
Ninja: try work around for bcc32 bug
1333b57
Ninja: build server fixes
9081e3a
remove warning about unused parameter
f430bea
Ninja: maybe this fixes the bcc32 build
f2c1288
Ninja: msvc6 for-scoping
44b9bbc
Ninja: build with old msvc versions
57156a5
Ninja: build server fixes
f1abdce
Ninja: some bytes of the rc files couldn't be piped correctly
2de963d
Ninja: don't remove space between command and parameters
50b6f33
Ninja: build cmcldeps with mingw
c05653e
Ninja: try to make GetProcessId visible
ab245ff
Ninja: but cl supports /nologo ...
bf58e9a
Ninja: no /nologo option in old rc.exe
2fb07fc
Ninja: Eclipse and KDevelop fixes for ninja
518c065
Ninja: don't pollute build dir with preprocessed rc files
...
2012-06-19 14:42:41 -04:00
Eric NOULARD
5ac6ca083f
CPackDeb add missing documentation for some CPACK_DEBIAN_xx variables.
...
Inspired-By: Doug Linden <linderd@iinet.net.au>
2012-06-19 14:32:16 -04:00
Jonathan Klein
4393b3bb43
FindBullet: Add missing math library name ( #13309 )
...
Add "LinearMath_Debug" to the list of names to search for
BULLET_MATH_LIBRARY_DEBUG. The _Debug name is present in all other
lines already. Now the script manages to find all debug&release
libraries on my system.
2012-06-18 08:29:41 -04:00
David Cole
a7ae34a97f
Merge topic 'RemoveASMDebugOutput'
...
0b343cb
ASM compiler detection: remove debug output (#13270 )
2012-06-14 16:28:44 -04:00
Alex Neundorf
0b343cb71e
ASM compiler detection: remove debug output ( #13270 )
...
This must have been left in accidentially.
Alex
2012-06-12 22:27:34 +02:00