summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'intel-compile-features-windows'Brad King2016-10-252-6/+12
|\
| * Intel: Fix compiler extension flags on WindowsBrad King2016-10-242-6/+12
* | Merge topic 'android-pic'Brad King2016-10-2515-35/+9
|\ \
| * | Android: Link position-independent executables with proper flagsBrad King2016-10-241-0/+4
| * | Android: Set CMAKE_POSITION_INDEPENDENT_CODE automaticallyBrad King2016-10-2415-35/+5
* | | Merge topic 'android-link-exe'Brad King2016-10-244-0/+16
|\ \ \ | |/ /
| * | Android: Add missing link flags for device executablesBrad King2016-10-214-0/+16
* | | Merge topic 'android-armeabi-c++_static'Brad King2016-10-211-0/+2
|\ \ \ | |/ /
| * | Android: Fix support for armeabi with c++_staticBrad King2016-10-211-0/+2
| |/
| * 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
* | | | | | | | | Merge topic 'external-project-source-subdir-usage'Brad King2016-10-191-8/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | ExternalProject: make SOURCE_SUBDIR directly appendableBen Boeckel2016-10-181-6/+6
| * | | | | | | | ExternalProject: error out only if the property is unsetBen Boeckel2016-10-181-2/+3
* | | | | | | | | Merge topic 'ExternalData-multiple-hashes'Brad King2016-10-191-19/+91
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ExternalData: Add support for multiple hash algorithmsMatt McCormick2016-10-181-19/+91
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'fix-Android-NsightTegra'Brad King2016-10-191-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | VS: Fix NVIDIA Nsight Tegra Visual Studio Edition supportBrad King2016-10-181-1/+1
| | |/ / / / / | |/| | | | |
| * | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to projectBill Hoffman2016-10-171-1/+3
* | | | | | | | | | | | | Merge topic 'CheckFunctionExists-prototype'Brad King2016-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | CheckFunctionExists.c: avoid gcc warnings with -Wstrict-prototypesAndre McCurdy2016-10-141-1/+1
* | | | | | | | | | | | | | Merge topic 'FindwxWidgets-unversioned-library-path'Brad King2016-10-181-12/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | FindwxWidgets: Fix finding unversioned VS-built directory prefixesBrad King2016-10-171-12/+22
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'osx-no-deployment-target-on-cross-compile'Brad King2016-10-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | OS X: Do not try to set deployment target when cross-compilingGregor Jasny2016-10-171-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'vs-host-x64-tools'Brad King2016-10-142-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | VS: Provide an option to use x64 host toolsBrad King2016-10-142-0/+8
* | | | | | | | | | | | Merge topic 'FindBoost-minor-cleanup'Brad King2016-10-141-13/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | FindIce: Add support for version 3.6.3Roger Leigh2016-10-131-0/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge topic 'FindSDL-mingw-mwindows'Brad King2016-10-131-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | FindSDL: Add -mwindows to link flags for MinGW, correct wordingEmil Laine2016-10-121-4/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |