summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindHDF5-updates'Brad King2015-09-141-4/+24
|\ | | | | | | | | fd26a19a FindHDF5: Add NAMES_PER_DIR and introduce HDF5_PREFER_PARALLEL
| * FindHDF5: Add NAMES_PER_DIR and introduce HDF5_PREFER_PARALLELPaul Romano2015-09-111-4/+24
| | | | | | | | | | | | | | The calls to find_program now use NAMES_PER_DIR so that the first executable (e.g. h5pcc) appearing on their PATH will get chosen. The HDF5_PREFER_PARALLEL variable swaps the search order when it is set to true in the event that a directory being search contains both h5cc and h5pcc.
* | CMakeParseImplicitLinkInfo: Do not match "VAR=..." as link line (#15737)Brad King2015-09-111-1/+1
|/ | | | | | | | | | | | | | | When compiling with LDFLAGS='-Wl,-z,relro -specs=/usr/lib/rpm/redhat/redhat-hardened-ld' the compiler output includes a line like COLLECT_GCC_OPTIONS='-specs=/usr/lib/rpm/redhat/redhat-hardened-ld' ... that our link line regex matches due to an argument ending in "-ld". Since it is not really the link line no implicit link information is dectected. Exclude "VAR=..." lines from consideration as link lines to fix this.
* Features: Extract strings from test binary more reliably (#15736)Brad King2015-09-101-1/+1
| | | | | | | | | | Since commit v3.1.0-rc1~635^2~7 (project: Add infrastructure for recording CXX compiler features, 2013-10-17) we compile a test source to a binary and then extract "<LANG>_FEATURES:..." strings from the binary with the file(STRINGS) command. Add a newline at the beginning of the string literal to be sure file(STRINGS) can extract the first entry as a string independent of whatever else the compiler may put before the storage it allocates for the literal within the binary.
* Merge topic 'cpack-cmake-special-characters-mangling'Brad King2015-09-101-43/+48
|\ | | | | | | | | 2a7772ff CPack: don't mangle CMake-special characters when applying default settings
| * CPack: don't mangle CMake-special characters when applying default settingsRoman Donchenko2015-09-091-43/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mangling is prevented by using a function instead of a macro for setting default value of some CPack variables. Function is meant for internal use in CPack.cmake only. Old macro is deprecated but kept for backwards compatibility - was intended for internal use only as it can't be used for CPack after CPack.cmake script is included. Patch removes local workarounds that were required by old macro, fixes default setting of variables that by default inherit value from another variable that already went through old default setting macro (e.g. value of CPACK_PACKAGE_INSTALL_REGISTRY_KEY caused error for wrong escapes if CPACK_PACKAGE_INSTALL_DIRECTORY contained escaped back slashes) and provides a test for correct escaping of characters.
* | Merge topic 'cpack-deb-component-dependencies'Brad King2015-09-101-16/+60
|\ \ | | | | | | | | | | | | 4de7c812 CPack/Deb: enable per component setting of dependencies
| * | CPack/Deb: enable per component setting of dependenciesDomen Vrankar2015-09-091-16/+60
| |/
* | Merge topic 'FindwxWidgets-updates'Brad King2015-09-101-5/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | d8e233d8 Help: Add notes for topic 'FindwxWidgets-updates' 15aacb68 FindwxWidgets: Add wxWidgets webview component 8122fbd0 FindwxWidgets: Expect wxWidgets 3.1 6089fde5 FindwxWidgets: allow specifying required version
| * | FindwxWidgets: Add wxWidgets webview componentSimon Richter2015-09-091-1/+1
| | |
| * | FindwxWidgets: Expect wxWidgets 3.1Simon Richter2015-09-091-1/+5
| | |
| * | FindwxWidgets: allow specifying required versionSimon Richter2015-09-091-3/+28
| | |
* | | Merge topic 'FindSWIG-noproxy'Brad King2015-09-101-4/+6
|\ \ \ | | | | | | | | | | | | | | | | 96a8890c FindSWIG: Do not generate erroneous outputs with -noproxy
| * | | FindSWIG: Do not generate erroneous outputs with -noproxyBen Webb2015-09-091-4/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generally for a module foo, SWIG generates (in Python mode) an extension module _foo.so and a proxy Python module foo.py. However, if -noproxy is specified, instead it builds only foo.so (without the leading underscore). The custom command generated by CMake correctly handles the removal of this underscore when -noproxy is given; however, it still adds foo.py to the expected outputs. This upsets build tools that expect foo.py to be generated (for example, 'make' will run the SWIG command twice). Fix this by removing foo.py from the set of extra generated files when -noproxy is specified.
* | | Merge topic 'mingw-compile-features-C'Brad King2015-09-101-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 2fbc41f3 Record compile features for GNU C on Windows (#15727)
| * | | Record compile features for GNU C on Windows (#15727)Brad King2015-09-091-2/+2
| |/ / | | | | | | | | | Drop the 'UNIX' condition on GNU C compiler features.
* | | Merge topic 'ar-option-order'Brad King2015-09-104-4/+4
|\ \ \ | | | | | | | | | | | | | | | | 08659ff4 Re-order 'ar' options 'cq' => 'qc'
| * | | Re-order 'ar' options 'cq' => 'qc'Brad King2015-09-094-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documetnation of binutils: https://sourceware.org/binutils/docs/binutils/ar-cmdline.html suggests to use the parameters "q" and "c" in this order ("q" is operation, and "c" is the modifier). Suggested-by: Дилян Палаузов <dilyan.palauzov@aegee.org>
* | | Merge topic 'ghs-updates'Brad King2015-09-101-7/+29
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 04de9007 GHS: Fix generated file path slashes and quoting for 6.1.6 fbe0de92 GHS: Tell MULTI to delete .elf.ael file 63591b94 GHS: Find latest 'int' directory
| * | GHS: Find latest 'int' directoryGeoff Viola2015-09-091-7/+29
| |/
* | Merge topic 'more-swift2-fixes'Brad King2015-09-092-2/+52
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 9cdf6ef4 Swift: Add proper Swift compiler test 1aa29f0d Swift: Remove positive Swift language tests d778a1c2 Swift: Require Xcode 6.1 and for MacOS X at least SDK 10.10 4da60024 Swift: Fix Compiler-Id detection for Swift 2 874a265c Swift: Make SwiftMix compatible with Swift 2
| * | Swift: Add proper Swift compiler testGregor Jasny2015-09-061-1/+51
| | | | | | | | | | | | | | | This catches for example the unavailability of Swift with Xcode Beta6 and macosx10.10 SDK.
| * | Swift: Fix Compiler-Id detection for Swift 2Gregor Jasny2015-09-031-1/+1
| | |
* | | Merge topic 'wbpvf_no_deref'Brad King2015-09-093-14/+14
|\ \ \ | |_|/ |/| | | | | | | | ea080e3e write_basic_package_version_file: remove variable dereferences in templates
| * | write_basic_package_version_file: remove variable dereferences in templatesRolf Eike Beer2015-09-043-14/+14
| |/ | | | | | | Fixes some minor whitespace issues in the if()s.
* | Merge topic 'FindOpenSSL-static-libs'Brad King2015-09-081-5/+30
|\ \ | | | | | | | | | | | | 369a8cde FindOpenSSL: Optionally search only for static libraries
| * | FindOpenSSL: Optionally search only for static librariesThijs Wenker2015-09-021-5/+30
| |/ | | | | | | | | | | | | Add an OPENSSL_USE_STATIC_LIBS option to enable it. Adjust CMAKE_FIND_LIBRARY_SUFFIXES to only look for .a and .lib files. Also adjust the search paths on Windows for installer locations of static libraries.
* | FindZLIB: Find debug and release variants separatelyMichael Scott2015-09-021-5/+40
|/ | | | | | Provide each variant in ZLIB_LIBRARIES and ZLIB::ZLIB imported location properties when one is found, while maintaining support for manually setting the library via ZLIB_LIBRARY.
* FindHDF5: Add hdf5_hl to list of libraries to search for Fortran_HLPaul Romano2015-09-011-1/+1
| | | | | | | When the Fortran_HL component is specified, the hdf5_hl library is not included in HDF5_LIBRARIES which causes a bunch of undefined references at link time. This commit adds hdf5_hl to the list of libraries to search for when the Fortran_HL component is specified.
* FindHDF5: Fix support for HL and Fortran_HL componentsPaul Romano2015-09-011-0/+2
| | | | | | Define HDF5_{Fortran_,}HL_COMPILE_LINE so that HDF5_{Fortran_,}HL_INCLUDE_DIR and HDF5_{Fortran_,}HL_LIBRARIES are found when the macro is invoked for HL and Fortran_HL components. (Use patch from debian cmake-data package.)
* Merge topic 'FindJNI-mips'Brad King2015-08-311-1/+1
|\ | | | | | | | | 90a22c3a FindJNI: Add mips64(el) mipsn32(el) support (#15714)
| * FindJNI: Add mips64(el) mipsn32(el) support (#15714)Yunqiang Su2015-08-281-1/+1
| | | | | | | | Submitted-by: Felix Geyer <fgeyer@debian.org>
* | GenerateExportHeader: Use dllexport/dllimport on CygwinTony Kelman2015-08-271-1/+1
|/ | | | | | | Cygwin sits on top of Windows and so can use explicit symbol export and import markup too. Co-Author: Yaakov Selkowitz <yselkowitz@cygwin.com>
* Merge topic 'FindJNI-suse-and-ibm'Brad King2015-08-271-0/+8
|\ | | | | | | | | 290b0f94 FindJNI: Add support for SuSE platform and IBM Java SDK
| * FindJNI: Add support for SuSE platform and IBM Java SDKMarc Chevrier2015-08-251-0/+8
| |
* | Merge topic 'apple-tbd-stubs'Brad King2015-08-271-1/+1
|\ \ | | | | | | | | | | | | 67f60958 Darwin: Add support for tbd library stub files
| * | Darwin: Add support for tbd library stub filesGregor Jasny2015-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Starting with Xcode 7 the OSX and iOS SDKs contain only stub files for dynamic system libraries. These stub files contain some meta data and a list of exported sysbols in plain text. They are handled by the toolchain like regular dylibs.
* | | Merge topic 'java-updates'Brad King2015-08-271-0/+157
|\ \ \ | | | | | | | | | | | | | | | | 4476feac UseJava: Add support for javah tool
| * | | UseJava: Add support for javah toolMarc Chevrier2015-08-211-0/+157
| | | | | | | | | | | | | | | | Add a `create_javah` API.
* | | | Merge topic 'fphsa-typo'Brad King2015-08-251-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 64e527db FPHSA: fix typo in documentation
| * | | FPHSA: fix typo in documentationRolf Eike Beer2015-08-241-1/+1
| | |/ | |/|
* | | FindJNI: Add support for x32 architecture on Linux (#15710)Thorsten Glaser2015-08-241-0/+4
|/ / | | | | | | | | This architecture uses an amd64 kernel but x32 userland. Use CMAKE_LIBRARY_ARCHITECTURE to distinguish it for now.
* | Merge topic 'FindCUDA-vs2013-separate-compilation'Brad King2015-08-211-3/+2
|\ \ | | | | | | | | | | | | 9b2f6992 FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)
| * | FindCUDA: Fix object build rule for separate compilation on VS 2013+ (#15697)Dominic Meiser2015-08-201-3/+2
| | | | | | | | | | | | | | | | | | The handling of multilevel dependencies has been fixed in Visual Studio 2013. The work around used for VS 2010 and VS 2012 does not work for VS 2013 any more. Switch to normal object build rules for VS 2013 and newer.
* | | Merge topic 'sublime-msvc-includes'Brad King2015-08-211-0/+4
|\ \ \ | |_|/ |/| | | | | | | | c66835fc Extra Generator: Populate MSVC system include paths from environment (#15597)
| * | Extra Generator: Populate MSVC system include paths from environment (#15597)Gregor Jasny2015-08-181-0/+4
| |/
* | Merge topic 'hp-ux-itanium-shared-libs'Brad King2015-08-211-3/+5
|\ \ | | | | | | | | | | | | 625225bb HP-UX: Do not use ".sl" extension for shared libs on Itanium
| * | HP-UX: Do not use ".sl" extension for shared libs on ItaniumBrad King2015-08-181-3/+5
| | | | | | | | | | | | | | | | | | Instead use the standard ".so" extension. Suggested-by: Gerhard Grimm <gerhard.grimm@detec.com>
* | | Merge topic 'determine-compiler-CMP0054'Brad King2015-08-212-6/+8
|\ \ \ | |_|/ |/| | | | | | | | dc8822f0 CMakeDetermine{C,CXX}Compiler: Avoid if() auto-dereferene in quoted arguments
| * | CMakeDetermine{C,CXX}Compiler: Avoid if() auto-dereferene in quoted argumentsMatt McCormick2015-08-202-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposed by a CMP0054 warning with code like: cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR) project(MyProj NONE) enable_language(C) enable_language(CXX) While at it, use STREQUAL for testing the compiler id against "GNU". Suggested-by: Rolf Eike Beer <eike@sf-mail.de>
generated by cgit v0.12 at 2025-01-11 04:01:18 (GMT)