summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: Ignore Xcode project warning until issue is fixedGregor Jasny2017-01-261-1/+1
| | | | Issue: #15272
* Makefile: For static libraries remove only the "real" lib before creatingGregor Jasny2017-01-261-13/+14
| | | | | | | When creating a static library with the archive tool, only the `.a` needs to be removed to start a fresh archive. Any other files (e.g. symbolic links we may later add) are not managed by the archive tool and therefore do not need to be cleaned.
* Makefile: Re-order list of files to cleanGregor Jasny2017-01-261-4/+4
| | | | | Revise construction of the list of files to be cleaned for the target to list the "real" file first.
* Merge topic 'tests_auto_type'Brad King2017-01-262-1/+4
|\ | | | | | | | | ef47272b Tests: use cxx_auto_type only if actually available
| * Tests: use cxx_auto_type only if actually availableRolf Eike Beer2017-01-252-1/+4
| | | | | | | | | | The presence of CMAKE_CXX_COMPILE_FEATURES doesn't mean cxx_auto_type is always available.
* | Merge topic 'FindCUDA-select-flags-auto-msvc'Brad King2017-01-261-9/+11
|\ \ | | | | | | | | | | | | c1f3086d FindCUDA: Enable CUDA_SELECT_NVCC_ARCH_FLAGS Auto for MSVC
| * | FindCUDA: Enable CUDA_SELECT_NVCC_ARCH_FLAGS Auto for MSVCBjoern Thiel2017-01-251-9/+11
| | | | | | | | | | | | Fixes: #16525
* | | Merge topic 'pkg-config-recheck'Brad King2017-01-262-1/+11
|\ \ \ | | | | | | | | | | | | | | | | 796dea67 FindPkgConfig: Recheck pkg-config on parameter change.
| * | | FindPkgConfig: Recheck pkg-config on parameter change.Matthew Hanna2017-01-252-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, once pkg_check_modules succeeds, it will never call _pkg_check_modules_internal again. That means that if the parameters to pkg_check_modules are changed, cmake will be called to reconfigure, but nothing will change. This change is to store the full string of arguments to pkg_check_modules and override the FOUND optimization so that the arguments are reevaluated when modified.
* | | | Merge topic 'FindGTK2_RunTwice'Brad King2017-01-265-42/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 4bc2c16b FindGTK2: Add unit test to check variables when run twice 9702b3ee FindGTK2: Fix GTK2_LIBRARIES and GTK2_TARGETS when called twice
| * | | | FindGTK2: Add unit test to check variables when run twiceDaniele E. Domenichelli2017-01-254-0/+32
| | | | |
| * | | | FindGTK2: Fix GTK2_LIBRARIES and GTK2_TARGETS when called twiceDaniele E. Domenichelli2017-01-251-42/+40
| | |/ / | |/| | | | | | | | | | Closes: #16582
* | | | Merge topic 'FindLua-versioned-lib'Brad King2017-01-261-7/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2759e225 FindLua: try to find library according to version from header
| * | | | FindLua: try to find library according to version from headerBrad King2017-01-241-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Patch-by: fft on gitlab.kitware.com Issue: #15756
* | | | | CMake Nightly Date StampKitware Robot2017-01-261-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'testdriver-cleanup'Brad King2017-01-251-88/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb86b4ce TestDriver: fix/silence clang-tidy warnings 178c8973 TestDriver: calc NumTests at compile time 3bb4a798 TestDriver: use for loop 60b68304 TestDriver: abstract CM_CAST macro 1731b90c TestDriver: Revise C++ coding style using clang-format
| * | | | TestDriver: fix/silence clang-tidy warningsDaniel Pfeifer2017-01-241-15/+12
| | | | |
| * | | | TestDriver: calc NumTests at compile timeDaniel Pfeifer2017-01-241-5/+4
| | | | |
| * | | | TestDriver: use for loopDaniel Pfeifer2017-01-241-3/+1
| | | | |
| * | | | TestDriver: abstract CM_CAST macroDaniel Pfeifer2017-01-241-13/+9
| | | | |
| * | | | TestDriver: Revise C++ coding style using clang-formatDaniel Pfeifer2017-01-241-65/+45
| | | | |
* | | | | Merge topic 'intel-mpi-windows-fix'Brad King2017-01-251-5/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6eaf25c FindMPI: Strip quotes from include path and convert to CMake path format 39bf93c8 FindMPI: Add Intel MPI wrapper names on Windows
| * | | | | FindMPI: Strip quotes from include path and convert to CMake path formatChristian Pfeiffer2017-01-231-0/+2
| | | | | |
| * | | | | FindMPI: Add Intel MPI wrapper names on WindowsChristian Pfeiffer2017-01-231-5/+6
| | | | | |
* | | | | | Merge topic 'cpack-ifw-options'Brad King2017-01-254-39/+247
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5089c56 CPackIFW: Add some options
| * | | | | | CPackIFW: Add some optionsKonstantin Podsvirov2017-01-244-39/+247
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cpack_ifw_configure_component_group command gained options: - DEPENDS. The cpack_ifw_configure_component and cpack_ifw_configure_component_group commands gained options: - REQUIRES_ADMIN_RIGHTS; - UPDATE_TEXT; - SORTING_PRIORITY; # New name for PRIORITY - DEPENDENCIES; # Alias for DEPENDS - AUTO_DEPEND_ON; - TRANSLATIONS. For both commands PRIORITY option now is depreceted. Please use SORTING_PRIORITY instead.
* | | | | | Merge topic 'sanitizer-options'Brad King2017-01-258-15/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e116f2a5 ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is empty 522e1588 Tests: Use CTEST_MEMORYCHECK_SANITIZER_OPTIONS where appropriate
| * | | | | | ctest_memcheck: Fix sanitizers when MemoryCheckSanitizerOptions is emptyJamie Snape2017-01-237-13/+19
| | | | | | |
| * | | | | | Tests: Use CTEST_MEMORYCHECK_SANITIZER_OPTIONS where appropriateJamie Snape2017-01-231-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Previously the ThreadSanitizer and MemorySanitizer tests erroneously used `CTEST_MEMORYCHECK_COMMAND_OPTIONS`.
* | | | | | Merge topic 'lang_lint'Brad King2017-01-2537-10/+185
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0618ddf6 Add properties to run the cpplint style checker with the compiler
| * | | | | | Add properties to run the cpplint style checker with the compilerJamie Snape2017-01-2337-10/+185
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `<LANG>_CPPLINT` target property (initialized by a `CMAKE_<LANG>_CPPLINT` variable) to specify a `cpplint` style checker command line to be run along with the compiler.
* | | | | | Merge topic 'cuda_linker_preference'Brad King2017-01-251-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | df3353d1 CUDA: set linker preference between C and C++
| * | | | | CUDA: set linker preference between C and C++Robert Maynard2017-01-241-1/+1
| |/ / / /
* | | | | 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
| | | | | | | | |
generated by cgit v0.12 at 2025-02-01 08:50:05 (GMT)