summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests/CMakeLib: include what you useDaniel Pfeifer2016-09-033-4/+7
|
* Tests/CMakeLib: use cmsys::ifstreamDaniel Pfeifer2016-09-032-10/+16
|
* CMake Nightly Date StampKitware Robot2016-09-031-1/+1
|
* Merge branch 'release'Brad King2016-09-020-0/+0
|\
| * Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-09-011-1/+3
| |\
| * \ Merge branch 'vs-NsightTegra-empty-version' into releaseBrad King2016-08-261-5/+4
| |\ \
* | \ \ Merge topic 'autogen-base32'Brad King2016-09-024-12/+157
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 228f4e9b cmFilePathUuid: Use Base32 string instead of Base64 string b481ddb3 Add cmBase32Encoder class
| * | | | cmFilePathUuid: Use Base32 string instead of Base64 stringSebastian Holtermann2016-09-021-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This produces files that will not collide on a case-insensitive filesystem. It also avoids the need for special character substitutions.
| * | | | Add cmBase32Encoder classSebastian Holtermann2016-09-023-0/+151
| | | | |
* | | | | Merge topic 'GenerateExportHeader-fix-add_compiler_export_flags'Brad King2016-09-021-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0cbaaf2d GenerateExportHeader: Fix add_compiler_export_flags regression
| * | | | | GenerateExportHeader: Fix add_compiler_export_flags regressionBrad King2016-09-011-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mechanical conversion in commit 5d0d980d (Use string(APPEND) in Modules, 2016-07-28) accidentally introduced use of string(APPEND ... PARENT_SCOPE) Split that into the string(APPEND) and set(PARENT_SCOPE) pieces.
* | | | | Merge topic 'vs14-debug-enum-older-toolsets'Brad King2016-09-021-1/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 9998774f VS: Fix VS 2015 .vcxproj debug setting for v80 toolset
| * | | | VS: Fix VS 2015 .vcxproj debug setting for v80 toolsetBrad King2016-09-011-1/+3
| | | | | | | | | | | | | | | | | | | | Closes: #16281
* | | | | CMake Nightly Date StampKitware Robot2016-09-021-1/+1
| |/ / / |/| | |
* | | | Merge topic 'FindEXPAT-use-PkgConfig'Brad King2016-09-011-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fc695a77 FindEXPAT: use hints from PkgConfig
| * | | | FindEXPAT: use hints from PkgConfigChristoph Junghans2016-08-311-2/+6
| | | | |
* | | | | Merge topic 'FindCUDA-fixes'Brad King2016-09-011-10/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 900ee0b8 FindCUDA: Allow cuda_compile* macros to be called more than once per directory 6442709b FindCUDA: Fix for broken cuda_compile* commands.
| * | | | | FindCUDA: Allow cuda_compile* macros to be called more than once per directoryStephen Sorley2016-08-311-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a counter as a directory property that gets incremented every time one of the cuda_compile* macros is called. The value of this counter is then added to the phony target name passed to CUDA_WRAP_SRCS. This ensures that every call to one of these macros has its own unique intermediate output directory.
| * | | | | FindCUDA: Fix for broken cuda_compile* commands.Stephen Sorley2016-08-311-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The macros CUDA_COMPILE, CUDA_COMPILE_PTX, CUDA_COMPILE_FATBIN, and CUDA_COMPILE_CUBIN were broken by commit 7ded655 (FindCUDA: Take NVCC include directories from target properties, 2016-08-16). This bug is due to the fact that all of these macros call CUDA_WRAP_SRCS with a target name that's not an actual target, causing the new generator expressions to fail. Fix the bug by changing these macros to pass "PHONY" to CUDA_WRAP_SRCS. Now, when CUDA_WRAP_SRCS sees "PHONY", it falls back to the old behavior of populating the include directories and compile definitions from directory properties, instead of using target generator expressions.
* | | | | | Merge topic 'install-directory-genex-fix'Brad King2016-09-012-1/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bd55dba install: Fix evaluation of leading generator expressions in DIRECTORY
| * | | | | | install: Fix evaluation of leading generator expressions in DIRECTORYYves Frederix2016-08-312-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~58^2 (install: Allow generator expressions in DIRECTORY, 2016-01-12) we accidentally treat leading generator expressions as relative paths even though they may evaluate to absolute paths. Defer the conversion to an absolute path until after evaluation.
* | | | | | | CMake Nightly Date StampKitware Robot2016-09-011-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'doc-XCODE-variable'Brad King2016-08-312-0/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | 3e8615ef Document XCODE variable
| * | | | | Document XCODE variableRuslan Baratov2016-08-312-0/+5
| | | | | |
* | | | | | Merge topic '16101-xcode-fix-directory-exclude-from-all'Brad King2016-08-319-11/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | df32e564 Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)
| * | | | | | Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)Gregor Jasny2016-08-319-11/+41
| | | | | | |
* | | | | | | Merge topic 'FindOpenSSL-new-windows-names'Brad King2016-08-311-0/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed1758f8 FindOpenSSL: Fix detection of OpenSSL 1.1 Win32/64
| * | | | | | | FindOpenSSL: Fix detection of OpenSSL 1.1 Win32/64Alexis Murzeau2016-08-301-0/+17
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since OpenSSL 1.1.0, Windows binaries are libcrypto and libssl instead of the old names libeay32 and ssleay32. When using MSVC, FindOpenSSL was searching for the old lib names only so this add the new names to be able to find OpenSSL 1.1.0 libraries. For example, the files in lib directory of OpenSSL 1.1.0 Win64 : - libcrypto.lib - libssl.lib - VC/libcrypto64MD.lib - VC/libcrypto64MDd.lib - VC/libcrypto64MT.lib - VC/libcrypto64MTd.lib - VC/libssl64MD.lib - VC/libssl64MDd.lib - VC/libssl64MT.lib - VC/libssl64MTd.lib 32 bits OpenSSL has the same files with "32" instead of "64" for files in VC directory. MinGW still works and use lib/libcrypto.lib and lib/libssl.lib. This patch also add libssl and libcrypto for other windows compilers too (like Intel).
* | | | | | | Merge topic 'fortran-macOS-sysroot'Brad King2016-08-311-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6f96207 Fortran: Use -isysroot and -mmacosx-version-min= on macOS if available
| * | | | | | | Fortran: Use -isysroot and -mmacosx-version-min= on macOS if availableBrad King2016-08-301-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes: #16265
* | | | | | | Merge topic 'FindMatlab-additional-components'Brad King2016-08-313-20/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf09271b FindMatlab: adding handling of component "MAT"
| * | | | | | | FindMatlab: adding handling of component "MAT"Raffi Enficiaud2016-08-303-20/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - documentation - test - cosmetic changes
* | | | | | | | Merge topic 'syntax-unexpected-eof'Brad King2016-08-315-2/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1dda2ec5 Improve error message on unexpected end of file
| * | | | | | | | Improve error message on unexpected end of fileBrad King2016-08-305-2/+10
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Suggested-by: Stephen Kelly <steveire@gmail.com>
* | | | | | | | Merge topic 'import-libuv'Brad King2016-08-31112-1/+48235
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39ac889d cmake: Add trivial usage of libuv 7cf369fe Do not build libuv on HP-UX 075cae51 Do not build libuv on SPARC 9a53af40 Do not build libuv on Cygwin 219f7411 Do not build libuv on Mac OS X 10.4 and lower 8a5beef3 Add option to build CMake against a system libuv e56aa462 FindLibUV: Add module to find libuv package 551d5aed libuv: Fix unused variable warning in uv_loop_close f4f8074b libuv: Avoid including macOS CoreServices header globally a63aaaed libuv: Always include our own header first 9130b53a libuv: Conditionally declare Windows APIs for VS 2008 and below b52afa46 libuv: Fix anonymous union syntax 05dbc204 libuv: Fix Windows API function typedef syntax 75139374 libuv: Install LICENSE file with CMake documentation 95dcc4e4 libuv: Disable warnings to avoid changing 3rd party code 13b7e758 libuv: Build the library within CMake ...
| * | | | | | | | cmake: Add trivial usage of libuvBrad King2016-08-311-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will serve to make sure cmake actually compiles and links against libuv.
| * | | | | | | | Do not build libuv on HP-UXBrad King2016-08-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some work may be needed to port to HP-UX.
| * | | | | | | | Do not build libuv on SPARCBrad King2016-08-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some work may be needed to port to SPARC with Solaris and Linux.
| * | | | | | | | Do not build libuv on CygwinBrad King2016-08-311-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently libuv does not support Cygwin (see libuv issue 832) in part due to lack of pthread APIs: https://cygwin.com/cygwin-api/std-notimpl.html
| * | | | | | | | Do not build libuv on Mac OS X 10.4 and lowerBrad King2016-08-311-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It needs APIs that have been available only since 10.5. Also check that the CoreServices header can be included.
| * | | | | | | | Add option to build CMake against a system libuvBrad King2016-08-313-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a CMAKE_USE_SYSTEM_LIBUV option.
| * | | | | | | | FindLibUV: Add module to find libuv packageBrad King2016-08-315-0/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add it to a private source directory that is not installed so that we can use it for building CMake itself. This will allow it to mature before being distributed publicly.
| * | | | | | | | libuv: Fix unused variable warning in uv_loop_closeBrad King2016-08-311-0/+2
| | | | | | | | |
| * | | | | | | | libuv: Avoid including macOS CoreServices header globallyBrad King2016-08-311-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only need the availability macros in `unix/internal.h`. We already include CoreServices where needed in implementation files.
| * | | | | | | | libuv: Always include our own header firstBrad King2016-08-312-6/+6
| | | | | | | | |
| * | | | | | | | libuv: Conditionally declare Windows APIs for VS 2008 and belowBrad King2016-08-313-2/+23
| | | | | | | | |
| * | | | | | | | libuv: Fix anonymous union syntaxBrad King2016-08-311-2/+2
| | | | | | | | |
| * | | | | | | | libuv: Fix Windows API function typedef syntaxBrad King2016-08-311-5/+5
| | | | | | | | |
| * | | | | | | | libuv: Install LICENSE file with CMake documentationBrad King2016-08-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we install using the bundled libuv source, notify users of its license terms.
| * | | | | | | | libuv: Disable warnings to avoid changing 3rd party codeBrad King2016-08-312-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add '-w' or equivalent flag on compilers supporting it. Tell MSVC to use its lowest warning level inside libuv sources.