summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-doc-typos'Brad King2016-11-022-4/+4
|\ | | | | | | | | | | 4ab3b0c4 CPackRPM: Fix incorrect variable name in documentation e6460e7d CPackDeb: Fix incorrect variable name in documentation
| * CPackRPM: Fix incorrect variable name in documentationAlex Turbov2016-11-021-3/+3
| | | | | | | | | | | | `CPACK_RPM_COMPONENT_INSTALL` is the correct variable to set to enable component packaging. `CPACK_RPM_PACKAGE_COMPONENT` is just set to a component name when CPack calls corresponding installer.
| * CPackDeb: Fix incorrect variable name in documentationAlex Turbov2016-11-021-1/+1
| | | | | | | | | | | | `CPACK_DEB_COMPONENT_INSTALL` is the correct variable to set to enable component packaging. `CPACK_DEB_PACKAGE_COMPONENT` is just set to a component name when CPack calls corresponding installer.
* | Merge topic 'fix-macos-sysroot'Brad King2016-11-022-30/+2
|\ \ | | | | | | | | | | | | | | | 93504190 Darwin: Remove deployment target version check 542d52f9 Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path"
| * | Darwin: Remove deployment target version checkGregor Jasny2016-11-012-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Xcode 8 the SDK folder also contains an unversioned entry: MacOSX.sdk MacOSX10.12.sdk -> MacOSX.sdk If this unversioned path is used CMake cannot detect the SDK version. Furthermore, querying the SDK version via xcodebuild -sdk <sysroot> -version Path gives bogus results for the Command Line Tools installed into `/`. The OS X deployment target version and SDK version are not as tied as they once were, so this check is now more trouble than it is worth. Simply remove it. Closes: #16323
| * | Revert "Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path"Gregor Jasny2016-11-011-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.7.0-rc1~48^2 (Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path, 2016-09-25). The replacement of `else()` with `if(CMAKE_OSX_SYSROOT)` defeats the prior handling of `if("x${CMAKE_OSX_SYSROOT}" MATCHES "/")`. This causes the combination -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING="" -DCMAKE_OSX_SYSROOT:STRING=/ to not be honored and `-isysroot` to be emitted as a compiler flag universally. We will need another solution to the problem the now-reverted commit was meant to address. Closes: #16394
* | | Merge topic 'UseSWIG-SWIG_OUTFILE_DIR'Brad King2016-11-021-3/+13
|\ \ \ | | | | | | | | | | | | | | | | 8444b984 UseSWIG: Add option to specify swig output file directory
| * | | UseSWIG: Add option to specify swig output file directoryCong Zhang2016-11-011-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `swig` has two output-related options: * `-o <outfile>`: Set name of C/C++ output file to <outfile> * `-outdir <dir>`: Set language-specific files output directory to <dir> We already have `CMAKE_SWIG_OUTDIR` for the latter. Add a new `SWIG_OUTFILE_DIR` option for the former.
* | | | Merge topic 'CPackDeb-doc-typos'Brad King2016-11-011-3/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| c75b8910 CPackDeb: fix copy-n-paste typos in documentation
| * | CPackDeb: fix copy-n-paste typos in documentationAlex Turbov2016-11-011-3/+3
| |/
* | Merge topic 'FindSDL-sound-fix'Brad King2016-11-011-4/+3
|\ \ | | | | | | | | | | | | f2ff9495 FindSDL_sound: Fix SDL_SOUND_LIBRARIES result value
| * | FindSDL_sound: Fix SDL_SOUND_LIBRARIES result valueBrad King2016-10-281-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | The value is meant to be a plain-variable ;-list. Remove quotes and caching. Patch-by: Aleksey Chernov (virx on gitlab.kitware.com) Closes: #16390
* | | Merge topic 'FindMatlab-fix-typo'Brad King2016-11-012-3/+3
|\ \ \ | | | | | | | | | | | | | | | | f2de7079 FindMatlab: Fix typo in matlab_add_unit_test implementation
| * | | FindMatlab: Fix typo in matlab_add_unit_test implementationMatthew Woehlke2016-10-282-3/+3
| | |/ | |/| | | | | | | | | | | | | | | | Fix typo in variable used to communicate between matlab_add_unit_test and its helper script MatlabTestsRedirect.cmake that was introduced in commit v3.7.0-rc1~116^2 (FindMatlab: Extend matlab_add_unit_test to run arbitrary test code, 2016-08-30).
* | | Merge topic 'FindMatlab-9.1'Brad King2016-11-011-0/+1
|\ \ \ | | | | | | | | | | | | | | | | e29f33cd FindMatlab: Add support for Matlab 2016b (9.1)
| * | | FindMatlab: Add support for Matlab 2016b (9.1)Francesco Romano2016-10-281-0/+1
| |/ /
* | | Features: Record features for Intel Compiler on WindowsBrad King2016-10-274-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this compiler always defines `__cplusplus` to `1` we need to use `_MSC_VER`, `__INTEL_CXX11_MODE__`, and the feature test macro named `__cpp_aggregate_nsdmi` to detect C++11 and C++14 modes. With no `-Qstd=` flag this compiler defaults to C++98 plus a subset of C++11/C++14 features needed to be compatible with MSVC. We pretend it is plain C++98 and add a `-Qstd=` flag whenever needed for C++11 or above features even if they would happen to be available in MSVC-mode. Closes: #16384
* | | Features: Port Intel CXX features to test macros where possibleBrad King2016-10-271-18/+31
| | | | | | | | | | | | | | | | | | The Intel 16 and 17 compilers define feature test macros of the form `__cpp_<feature>`. Use them where possible to detect corresponding features.
* | | Features: Unset Intel CXX feature temporariesBrad King2016-10-271-0/+10
| | |
* | | Intel: Remove incorrect C++98 standard compiler flag on WindowsBrad King2016-10-271-5/+6
| |/ |/| | | | | | | | | | | | | | | | | The change in commit 05e05cd2 (Intel: Fix compiler C++98 standard flag on Windows, 2016-10-26) was wrong. The Intel C++ Compiler for Windows does not support either `-Qstd=c++98` or `-Qstd=gnu++98`. Simply remove both flags for this compiler and use no options at all to achieve this mode. Issue: #16384
* | Merge topic 'intel-compiler-windows-c++98'Brad King2016-10-271-1/+5
|\ \ | | | | | | | | | | | | 05e05cd2 Intel: Fix compiler C++98 standard flag on Windows
| * | Intel: Fix compiler C++98 standard flag on WindowsBrad King2016-10-261-1/+5
| | | | | | | | | | | | | | | | | | | | | The Intel C++ Compiler for Windows does not support the `-Qstd=c++98` flag but does support `-Qstd=gnu++98`. Issue: #16384
* | | Merge topic 'intel-17-features'Brad King2016-10-271-3/+3
|\ \ \ | |/ / | | | | | | | | | 554b4f90 Features: Record features for Intel C++ 17 on UNIX
| * | Features: Record features for Intel C++ 17 on UNIXBrad King2016-10-261-3/+3
| | | | | | | | | | | | Issue: #16384
* | | Merge topic 'intel-compile-features-windows'Brad King2016-10-252-6/+12
|\ \ \ | |/ / | | | | | | | | | 881585f9 Intel: Fix compiler extension flags on Windows
| * | Intel: Fix compiler extension flags on WindowsBrad King2016-10-242-6/+12
| |/ | | | | | | | | | | | | | | | | The extension flags enabled by commit v3.6.0-rc1~120^2~1 (Features: Record standard flags for Intel C/C++ on Windows, 2016-04-18) of the form `-Qstd=gnu++11` are not supported by the Intel C/C++ Compiler for Windows. Fall back to using the non-extension form of the flags. Issue: #16384
* | Merge topic 'android-pic'Brad King2016-10-2515-35/+9
|\ \ | | | | | | | | | | | | | | | 4c272adb Android: Link position-independent executables with proper flags 6205f179 Android: Set CMAKE_POSITION_INDEPENDENT_CODE automatically
| * | Android: Link position-independent executables with proper flagsBrad King2016-10-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Add `-fPIE -pie` to the default executable link flags when `CMAKE_POSITION_INDEPENDENT_CODE` is enabled. This is required by Android 16 and above for executables to run on the device. Closes: #16382
| * | Android: Set CMAKE_POSITION_INDEPENDENT_CODE automaticallyBrad King2016-10-2415-35/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the toolchain file or cache does not set this, enable it automatically based on the Android API version. Versions 16 and above expect position independent code. Use the main `CMAKE_POSITION_INDEPENDENT_CODE` setting in favor of hard-coding `-fpic` or `-fPIC` in the compiler flags for each ABI. This allows CMake to use `-fpie` or `-fPIE` as needed when sources are meant for executables, and `-fpic` or `-fPIC` for other sources.
* | | Merge topic 'android-link-exe'Brad King2016-10-244-0/+16
|\ \ \ | |/ / | | | | | | | | | 295c8efa Android: Add missing link flags for device executables
| * | Android: Add missing link flags for device executablesBrad King2016-10-214-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | See `${ndk}/build/core/default-build-commands.mk` for link flags the NDK uses for executables. Add them to our default executable link flags. Suppress `nocopyreloc` on `arm64-v8a` because it does not work with some STL types. Closes: #16380
* | | Merge topic 'android-armeabi-c++_static'Brad King2016-10-211-0/+2
|\ \ \ | |/ / | | | | | | | | | 43f4326e Android: Fix support for armeabi with c++_static
| * | Android: Fix support for armeabi with c++_staticBrad King2016-10-211-0/+2
| |/ | | | | | | | | | | | | | | Add missing "unwind" and "atomic" libraries needed for this combination. See `${ndk}/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++.a` for the libraries the NDK uses. Issue: #16380
| * Merge branch 'fix-Android-NsightTegra' into releaseBrad King2016-10-181-1/+1
| |\
| * \ Merge branch 'external-project-source-subdir-usage' into releaseBrad King2016-10-181-8/+9
| |\ \
| * \ \ Merge branch 'FindwxWidgets-unversioned-library-path' into releaseBrad King2016-10-171-12/+22
| |\ \ \
| * \ \ \ Merge branch 'osx-no-deployment-target-on-cross-compile' into releaseBrad King2016-10-171-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'ice-3.6.3' into releaseBrad King2016-10-131-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'ExternalProject-fix-CMAKE_CACHE_ARGS-list' into releaseBrad King2016-10-101-1/+1
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'external-project-clone-progress'Brad King2016-10-201-3/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e89fbfaf ExternalProject: support GIT_PROGRESS argument 64aa29b7 ExternalProject: fix typo
| * | | | | | | | ExternalProject: support GIT_PROGRESS argumentBen Boeckel2016-10-181-2/+13
| | | | | | | | |
| * | | | | | | | ExternalProject: fix typoBen Boeckel2016-10-181-1/+1
| | | | | | | | |
* | | | | | | | | ExternalProject: support extracting the configure commandBen Boeckel2016-10-191-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the configure command generated by ExternalProject was not accessible prior to actually adding the targets. This makes the CMake configure command accessible with just a call to _ep_parse_arguments. Future work will leverage this to support custom environment settings on a per-project basis.
* | | | | | | | | Merge topic 'external-project-source-subdir-usage'Brad King2016-10-191-8/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 615f3ed2 ExternalProject: make SOURCE_SUBDIR directly appendable fdce782b ExternalProject: error out only if the property is unset
| * | | | | | | | ExternalProject: make SOURCE_SUBDIR directly appendableBen Boeckel2016-10-181-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows it to be used in expansions without being conditional based on its value.
| * | | | | | | | ExternalProject: error out only if the property is unsetBen Boeckel2016-10-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Property values may be empty; instead make sure they exist and allow for empty values.
* | | | | | | | | Merge topic 'ExternalData-multiple-hashes'Brad King2016-10-191-19/+91
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33a9aaa8 ExternalData: Add support for multiple hash algorithms
| * | | | | | | | | ExternalData: Add support for multiple hash algorithmsMatt McCormick2016-10-181-19/+91
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for projects to have `Data.txt.md5` *and* `Data.txt.sha512` where the content links hold hashes for the same file. Check all `ExternalData_URL_TEMPLATES` entries in order for all available hashes. The data acquisition is considered a failure if none of the available URL resources has any of the given hashes. This makes it possible to have multiple data server resources where all servers do not support all hashing algorithms.
* | | | | | | | | Merge topic 'fix-Android-NsightTegra'Brad King2016-10-191-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 9af881d8 Tests: Add VSNsightTegra test for VS 2015 6739d240 Tests: Fix VSNsightTegra test on Android NDK r12b 06c39612 VS: Fix NVIDIA Nsight Tegra Visual Studio Edition support
| * | | | | | | VS: Fix NVIDIA Nsight Tegra Visual Studio Edition supportBrad King2016-10-181-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The guard added by commit v3.7.0-rc1~229^2~17 (Android: Suppress new functionality with Nsight Tegra in VS IDE builds, 2016-06-02) to `Modules/Platform/Android-Determine.cmake` does not work in that location because `CMAKE_VS_PLATFORM_NAME` is not set until after the module is loaded. Change this particular guard to test for the Visual Studio generator instead. If in the future we add support for using Visual Studio for Android without Nsight Tegra then something more will be needed, but this is good enough for now. Closes: #16371
generated by cgit v0.12 at 2025-02-07 12:02:28 (GMT)