summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | Merge branch 'FindProtobuf-fix-subdirs' into releaseBrad King2016-10-071-6/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'android-cxxabi' into releaseBrad King2016-10-071-0/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'android-ndk-r13' into releaseBrad King2016-10-061-1/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'cpack-rpm-debuginfo-fixes' into releaseBrad King2016-10-061-28/+40
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'FindMatlab-fix-simulink-cache' into releaseBrad King2016-10-051-0/+1
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'propagate_ctest_use_launchers'Brad King2016-10-181-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19beee46 ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to project
| * | | | | | | | | | | | ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to projectBill Hoffman2016-10-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `CTEST_USE_LAUNCHERS` is `TRUE` in a CTest script then the `ctest_configure` command will add `-DCTEST_USE_LAUNCHERS:BOOL=TRUE` to the cmake command used to configure the project. This allows a project to only set `CTEST_USE_LAUNCHERS` in a ctest script and have launchers work.
* | | | | | | | | | | | | Merge topic 'CheckFunctionExists-prototype'Brad King2016-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bc17345 CheckFunctionExists.c: avoid gcc warnings with -Wstrict-prototypes
| * | | | | | | | | | | | | CheckFunctionExists.c: avoid gcc warnings with -Wstrict-prototypesAndre McCurdy2016-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid warnings (and therefore build failures etc) if a user happens to add -Wstrict-prototypes to CFLAGS. | $ gcc --version | gcc (Ubuntu 4.8.4-2ubuntu1~14.04.3) 4.8.4 | | $ gcc -Wstrict-prototypes -Werror -DCHECK_FUNCTION_EXISTS=pthread_create -o foo.o -c Modules/CheckFunctionExists.c | Modules/CheckFunctionExists.c:7:3: error: function declaration isn't a prototype [-Werror=strict-prototypes] | CHECK_FUNCTION_EXISTS(); | ^ | cc1: all warnings being treated as errors | Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
* | | | | | | | | | | | | | Merge topic 'FindwxWidgets-unversioned-library-path'Brad King2016-10-181-12/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52e8fa23 FindwxWidgets: Fix finding unversioned VS-built directory prefixes
| * | | | | | | | | | | | | FindwxWidgets: Fix finding unversioned VS-built directory prefixesBrad King2016-10-171-12/+22
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.7.0-rc1~217^2 (FindwxWidgets: Add VS-versioned library directory prefixes, 2016-08-24) works only for official wxWidgets builds that add the VS-versioned directory prefixes. Local wxWidgets builds still have an unversioned prefix. Search them. Closes: #16366
* | | | | | | | | | | | | Merge topic 'osx-no-deployment-target-on-cross-compile'Brad King2016-10-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | e8bafb6f OS X: Do not try to set deployment target when cross-compiling
| * | | | | | | | | | | OS X: Do not try to set deployment target when cross-compilingGregor Jasny2016-10-171-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.4.0-rc2~6^2 (Xcode: Adjust deployment target SDK version to host version, 2015-10-11) does not make sense when cross-compiling. Make it conditional to fix this regression in some cross-compiling cases. Closes: #16355
* | | | | | | | | | | Merge topic 'vs-host-x64-tools'Brad King2016-10-142-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d079e71c VS: Provide an option to use x64 host tools 779939a0 Help: Document VS and Xcode toolset selection
| * | | | | | | | | | | VS: Provide an option to use x64 host toolsBrad King2016-10-142-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio provides toolchains that are themselves built for 32-bit or 64-bit host architectures. By default it uses the 32-bit tools, but it can be told to prefer the 64-bit tools on 64-bit hosts. Extend the `CMAKE_GENERATOR_TOOLSET` specification to provide a way to request use of the 64-bit host tools. Closes: #15622
* | | | | | | | | | | | Merge topic 'FindBoost-minor-cleanup'Brad King2016-10-141-13/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08b9a0fd FindBoost: Simplify library dir detection with cascading if/elseif/else ca4029fa FindBoost: Minor style updates 2e242b5c FindBoost: Use list(INSERT) to simplify suffix list generation 6699d46a FindBoost: Use string(APPEND) in more cases
| * | | | | | | | | | | | FindBoost: Simplify library dir detection with cascading if/elseif/elseAlex Turbov2016-10-131-6/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | FindBoost: Minor style updatesAlex Turbov2016-10-131-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | FindBoost: Use list(INSERT) to simplify suffix list generationAlex Turbov2016-10-131-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | FindBoost: Use string(APPEND) in more casesAlex Turbov2016-10-131-4/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'ice-3.6.3'Brad King2016-10-131-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e5a3655 FindIce: Add support for version 3.6.3
| * | | | | | | | | | | | FindIce: Add support for version 3.6.3Roger Leigh2016-10-131-0/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge topic 'FindSDL-mingw-mwindows'Brad King2016-10-131-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 632326a7 FindSDL: Add -mwindows to link flags for MinGW, correct wording
| * | | | | | | | | | | | FindSDL: Add -mwindows to link flags for MinGW, correct wordingEmil Laine2016-10-121-4/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `-mwindows` flag is needed to avoid creating an additional console window when starting SDL applications built with MinGW. There is no `mwindows` library. See also https://cygwin.com/ml/cygwin/2007-04/msg00027.html
generated by cgit v0.12 at 2024-11-15 12:03:44 (GMT)