summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindGTK2: Fix GTK2_LIBRARIES and GTK2_TARGETS when called twiceDaniele E. Domenichelli2017-01-251-42/+40
| | | | Closes: #16582
* CMake Nightly Date StampKitware Robot2017-01-251-1/+1
|
* Merge topic 'dl-libs-typo'Brad King2017-01-241-1/+1
|\ | | | | | | | | 114ac7d0 Help: Fix typo in CMAKE_DL_LIBS docs
| * Help: Fix typo in CMAKE_DL_LIBS docsThiago Perrotta2017-01-241-1/+1
| |
* | Merge topic 'cpack-stgz-minimal-test'Brad King2017-01-246-3/+82
|\ \ | | | | | | | | | | | | | | | 624709c8 CPack/STGZ: minimalistic packages test 1c93eb68 CPack/STGZ prefer pax for extraction
| * | CPack/STGZ: minimalistic packages testDomen Vrankar2017-01-225-2/+78
| | |
| * | CPack/STGZ prefer pax for extractionDomen Vrankar2017-01-221-1/+4
| | | | | | | | | | | | | | | | | | pax is part of POSIX while tar requires GNU extensions that are not part of some UNIX distros
* | | Merge topic 'android-include-api'Brad King2017-01-242-3/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1ee0ffab Android: Pass sysroot include directory explicitly 1806e011 Android: Fix c++_{static,shared} support include directory order
| * | | Android: Pass sysroot include directory explicitlyBrad King2017-01-201-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK's `build/core/definitions.mk` file adds compiler flags: -isystem $$(call host-path,$$(SYSROOT_INC)/usr/include) This passes the system include directory explicitly even though it is implied by `--sysroot=`. The explicit flag places the directory earlier in the include path than the sysroot-default one would be. Teach CMake to add this include directory at the end of the standard include path for Android. Otherwise the toolchain's `include-fixed/` directory may replace system headers with "fixed" copies that are not from the same API version. Closes: #16536
| * | | Android: Fix c++_{static,shared} support include directory orderBrad King2017-01-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK's own build files: <ndk>/build/tools/build-cxx-stl.sh <ndk>/build/cmake/android.toolchain.cmake for the `c++_static` and `c++_shared` build types add the `<ndk>/sources/android/support/include` include directory between the two `<ndk>/sources/cxx-stl/llvm-libc++*` directories. Re-order our own include directory generation to match. Issue: #16536
* | | | Merge topic '16253-xcode-effective-platform-name'Brad King2017-01-2410-4/+93
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 10c9c73d Xcode: Control emission of EFFECTIVE_PLATFORM_NAME
| * | | | Xcode: Control emission of EFFECTIVE_PLATFORM_NAMEGregor Jasny2017-01-2010-4/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building with multiple SDKs within one project Xcode requires the usage of ${EFFECTIVE_PLATFORM_NAME} to put temporary and build outout into separate directories. For example an iOS device and simulator build use two different SDKs (iphoneos and iphonesimulator). In the past cmake tries to detect embedded toolchains that could possibly use simulators and emitted EFFECTIVE_PLATFORM_NAME (EPN) at the proper locations. In #16253 Mark noticed that if he uses macosx and iphoneos in combination the necessary EPN is not emitted. This is because CMake by default assumes macosx SDK which does not trigger EPN emission. The fist naive approach - enabling EPN unconditionally revealed that then the EPN leaks into generator expressions like $<TARGET_FILE:xxx> which might be a regression and thus is unacceptable. The next approach was to add an CMake property to enable EPN emission unconditionally. This solved the reported problem. But the EPN leakage also happened for the embedded toolchains already without anyone noticing. So the control property was turned into a tri-state one: * No definition: EPN is activated for embedded toolchains like before * ON: EPN is always emitted * OFF: EPN is never emitted That approach gives the user the chance to disable EPN for embedded toolchains and restores generator expression functionality for those. Closes: #16253
* | | | | Merge topic 'qtdialog-trim-new-varname'Brad King2017-01-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8f1bce12 cmake-gui: trim spaces from user-created variable names
| * | | | | cmake-gui: trim spaces from user-created variable namesClinton Stimpson2017-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #15955
* | | | | | Merge topic 'qt4-lupdate-cmp0058'Brad King2017-01-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c2ac0b8 Qt4: Only change timestamp on generated .pro files if content changes
| * | | | | | Qt4: Only change timestamp on generated .pro files if content changesClinton Stimpson2017-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In qt4_create_translation() use file(GENERATE ...) instead of file(WRITE ...). This also removes a possible CMP0058 warning because file(GENERATE) tells the Ninja generator about the files it provides. Fixes: #16518
* | | | | | | Merge topic 'csproj-improvements'Brad King2017-01-247-27/+230
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bfb1249 VS: removed usage of relative paths for C# targets in in-source builds 90cb4083 VS: improve handling of source files with special extensions in .csproj
| * | | | | | | VS: removed usage of relative paths for C# targets in in-source buildsMichael Stürmer2017-01-181-6/+0
| | | | | | | |
| * | | | | | | VS: improve handling of source files with special extensions in .csprojMichael Stürmer2017-01-187-21/+230
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly <Link> and <DependentUpon> tags are added to connect generated and manually edited files. Special file extensions that are take care of are: - .Designer.cs - .xaml.cs - .settings - .resx - .xaml
* | | | | | | CMake Nightly Date StampKitware Robot2017-01-241-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-01-231-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-01-221-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-01-211-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'add-dl-to-lua-static-linking'Brad King2017-01-201-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | adc04afe FindLua: Add dl library to Lua static library linking
| * | | | | FindLua: Add dl library to Lua static library linkingMichael Krasnyk2017-01-201-0/+7
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | If a Lua library is compiled from source as `liblua.a` its link dependency on `dl` must be satisfied explicitly.
* | | | | Merge topic 'ExternalProject-restore-case-insensitive-hash'Brad King2017-01-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0ed885f7 ExternalProject: Restore case-insensitive download hash check
| * | | | | ExternalProject: Restore case-insensitive download hash checkBrad King2017-01-171-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.6.0-rc1~47^2 (ExternalProject: Re-implement download logic as a dedicated script, 2016-05-19) accidentally made the download hash check case-sensitive. The hash comparison is done in hex strings, so restore case-insensitive comparison since the case of the hex digits does not matter. Fixes: #16568
* | | | | Merge topic 'case-insensitive-bindir-detection'Brad King2017-01-201-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7f0a21a5 cmSystemTools: use the actual case for root detection
| * | | | | cmSystemTools: use the actual case for root detectionBen Boeckel2017-01-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, calling a binary installed with the default `bin` binary directory will fail to be detected when called as `BIN\cmake.exe` due to the string compare. Get the actual case of the path before checking that the path ends with `CMAKE_BIN_DIR`. Fixes #16574.
* | | | | | Merge topic 'cpack-ifw-new-installer-options'Brad King2017-01-204-3/+176
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3fc4a2b7 QtIFW: Added new options to QtIFW cpack generator for modifying wizard style
| * | | | | | QtIFW: Added new options to QtIFW cpack generator for modifying wizard styleAlexander Voitenko2017-01-174-3/+176
| | | | | | |
* | | | | | | Merge topic '16165-manually-added-dependencies'Brad King2017-01-2012-0/+67
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9f836e9 Add a getter for manually added target dependencies
| * | | | | | | Add a getter for manually added target dependenciesGregor Jasny2017-01-1612-0/+67
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Closes: #16165
* | | | | | | Merge topic 'cdash_upload_retry'Brad King2017-01-2014-52/+162
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05ed82b1 ctest_submit: Update documentation for CDash upload retries 0ce7643a ctest_submit: improve handling of QUIET option 5614a5cd ctest_submit: Allow RETRY_COUNT for CDASH_UPLOAD
| * | | | | | | ctest_submit: Update documentation for CDash upload retriesZack Galbreath2017-01-202-1/+12
| | | | | | | |
| * | | | | | | ctest_submit: improve handling of QUIET optionZack Galbreath2017-01-203-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the CDASH_UPLOAD signature of ctest_submit() to more thoroughly respect the QUIET option.
| * | | | | | | ctest_submit: Allow RETRY_COUNT for CDASH_UPLOADZack Galbreath2017-01-2011-42/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the CDASH_UPLOAD signature of ctest_submit() to honor the RETRY_COUNT and RETRY_DELAY options. Also teach HttpRequest() to honor the default 120 second timeout for curl connections.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-01-201-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-01-191-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-01-181-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'cmCTestBuildHandler-fix-warning'Brad King2017-01-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f3864452 cmCTestBuildHandler: Fix warning in FragmentCompare signature
| * | | | | cmCTestBuildHandler: Fix warning in FragmentCompare signatureBrad King2017-01-161-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` warning: the specified comparator type does not provide a const call operator [-Wuser-defined-warnings] ``` Reported-by: Sean McBride <sean@rogue-research.com>
* | | | | Merge topic 'update-kwsys'Brad King2017-01-173-7/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee77941a Merge branch 'upstream-KWSys' into update-kwsys 219c7bdc KWSys 2017-01-16 (a423d829)
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-01-163-7/+60
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-01-16 (a423d829)
| | * | | | KWSys 2017-01-16 (a423d829)KWSys Upstream2017-01-163-7/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit a423d82989a4b89fa7d17f3dd5215684e902208e (master). Upstream Shortlog ----------------- Ben Boeckel (1): 45db0937 SystemTools: use PathExists where appropriate Brad King (1): e08eee61 SystemTools: Fix conversion warning in test case Eric Berge (1): 687fcd79 Add -lsocket for libcmsys.a build on SunOS Gregor Jasny (1): 0541ce21 SystemTools: Fix off-by-one in GetLineFromStream with size limit
* | | | | | Merge topic 'FindICU-include-dirs'Brad King2017-01-171-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdf7e5d8 FindICU: Add 'include' to the path suffixes
| * | | | | | FindICU: Add 'include' to the path suffixesFlorent Castelli2017-01-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this FindICU doesn't recognise the installation within homebrew.
* | | | | | | Merge topic 'findhdf5-libraries-targets'Brad King2017-01-171-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5201a306 FindHDF5: use the target rather than the path
| * | | | | | | FindHDF5: use the target rather than the pathBen Boeckel2017-01-161-4/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, the `LOCATION` property gets the path to the `.dll` rather than the `.lib` which is unsuitable for linking.
* | | | | | | Merge topic 'fixtureUnusedOrdering'Brad King2017-01-174-22/+76
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 298b5b31 CTest: Ensure setup/cleanup ordering even when fixture not required
generated by cgit v0.12 at 2025-01-25 04:17:02 (GMT)