summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-rpm-debuginfo-pkg'Brad King2016-08-261-2/+63
|\ | | | | | | | | | | 426f97d3 CPack/RPM: Add test for debuginfo package generation bc8c0add CPack RPM debuginfo packages generation
| * CPack RPM debuginfo packages generationIstvan Bodnar2016-08-251-2/+63
| | | | | | | | | | Added new variable to CPackRPM for debuginfo rpm package generation. Binaries will be checked for debug symbols.
* | FindwxWidgets: Add VS-versioned library directory prefixesBrad King2016-08-251-3/+15
| | | | | | | | | | | | | | Add Visual Studio version number (supported: VS2008 to VS2015) to WX_LIB_DIR_PREFIX (old: vc / vc_x64; new: vc120 / vc120_x64). Patch-by: Hannes Grobler (Johnny_xy on gitlab.kitware.com)
* | FindwxWidgets: Add version 3.1.0Brad King2016-08-251-0/+1
|/ | | | Patch-by: Hannes Grobler (Johnny_xy on gitlab.kitware.com)
* Merge topic 'android-platform-modules'Brad King2016-08-2453-1/+1311
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b637ebd Android: Add `ANDROID` variable to indicate the target c2f561e5 Android: Add test cases covering use of the NDK and standalone toolchains 6b84df8d Help: Document cross compiling for Android d7d40830 Android: Select the STL type for NDK builds b22294bc Android: Populate compiler flags for current ABI b6a3102a Android: Add a CMAKE_BUILD_TYPE default d1e3cec2 Android: Add Clang -target option for current ABI 504db72d Android: Add placeholders for compiler/abi-specific settings fa632578 Android: Avoid interfering with common pre-existing toolchain files 6299693f Android: Search for NDK and standalone toolchain in more places 29b51379 Android: Detect and save a standalone toolchain without the NDK 7d9b49fb Android: Detect settings from the CMAKE_SYSROOT if it is set 4389664a Android: Detect and save a toolchain from the NDK 328191f6 Android: Set CMAKE_SYSROOT automatically 9e032304 Android: Detect and save the architecture, ABI, and processor fde59c4d Android: Detect and save the API level ...
| * Android: Add `ANDROID` variable to indicate the targetBrad King2016-08-231-0/+2
| | | | | | | | | | Allow projects to use `if(ANDROID)` to condition their Android-specific code paths.
| * Android: Select the STL type for NDK buildsBrad King2016-08-2315-0/+184
| | | | | | | | | | | | | | Populate standard include directories and link libraries for the platform. Select the STL corresponding to CMAKE_ANDROID_STL_TYPE and matching the current ABI and toolchain to be used. Refer to the NDK sources/cxx-stl/*/Android.mk files for the needed file locations.
| * Android: Populate compiler flags for current ABIBrad King2016-08-2317-0/+192
| | | | | | | | | | Initialize the CMAKE_{C,CXX}_FLAGS{,_<CONFIG>} cache entries with flags for each ABI as specified by NDK toolchain `setup.mk` files.
| * Android: Add a CMAKE_BUILD_TYPE defaultBrad King2016-08-121-0/+2
| | | | | | | | | | | | Android NDK builds are always `debug` or `release`. We may populate flags for these configurations that are needed to produce compatible binaries. Ensure they are used by default.
| * Android: Add Clang -target option for current ABIBrad King2016-08-129-0/+17
| |
| * Android: Add placeholders for compiler/abi-specific settingsBrad King2016-08-1221-0/+38
| | | | | | | | | | | | | | | | | | | | The Android NDK source repository at https://android.googlesource.com/platform/ndk.git has `<ndk>/build/core/toolchains/*/setup.mk` files that store tables of information for their build system. Add an equivalent file for each compiler/abi combination.
| * Android: Avoid interfering with common pre-existing toolchain filesBrad King2016-08-125-0/+36
| | | | | | | | | | | | | | | | | | Commonly used Android toolchain files that pre-date CMake upstream support may need to be updated to work with our new functionality. They typically set CMAKE_SYSTEM_VERSION to 1, so detect that and skip our upstream Android settings. When such toolchain files are updated to account for our upstream support, they can then set CMAKE_SYSTEM_VERSION to a valid Android API and get new behavior.
| * Android: Search for NDK and standalone toolchain in more placesBrad King2016-08-121-0/+8
| | | | | | | | | | | | Commonly used Android toolchain files that pre-date CMake upstream support use a few environment and CMake variables as search locations. Use them too to aid transition.
| * Android: Detect and save a standalone toolchain without the NDKBrad King2016-08-124-5/+115
| |
| * Android: Detect settings from the CMAKE_SYSROOT if it is setBrad King2016-08-121-1/+68
| |
| * Android: Detect and save a toolchain from the NDKBrad King2016-08-122-0/+296
| |
| * Android: Set CMAKE_SYSROOT automaticallyBrad King2016-08-121-0/+19
| | | | | | | | | | | | Compute CMAKE_SYSROOT automatically for the current API and architecture selection. This causes the --sysroot option to be passed to GNU and Clang compilers.
| * Android: Detect and save the architecture, ABI, and processorBrad King2016-08-121-1/+88
| | | | | | | | | | Add new CMakeSystem.cmake entries for the architecture and ABI. Store the processor in CMAKE_SYSTEM_PROCESSOR.
| * Android: Detect and save the API levelBrad King2016-08-121-0/+48
| | | | | | | | | | | | Store the Android API level in CMAKE_SYSTEM_VERSION. If it is not provided by the user, initialize it from CMAKE_ANDROID_API or fall back to finding the latest available in the NDK.
| * Android: Detect and save the NDK directoryBrad King2016-08-121-0/+27
| | | | | | | | Add a new CMakeSystem.cmake entry for the NDK location.
| * Android: Suppress new functionality with Nsight Tegra in VS IDE buildsBrad King2016-08-125-0/+41
| | | | | | | | | | | | Support for NVIDIA Nsight Tegra Visual Studio Edition was previously implemented in the CMake VS IDE generators. Avoid interfering with that functionality for now. Later we may try to integrate this.
| * Android: Add placeholders for platform-specific initializationBrad King2016-08-122-0/+29
| | | | | | | | | | Add infrastructure modules to be loaded when initializing builds targeting Android platforms.
| * Android: Add placeholders for platform-specific compiler selectionBrad King2016-08-123-0/+25
| | | | | | | | | | Add infrastructure modules to be loaded for determining a compiler selection when targeting Android platforms.
| * Android: Add placeholders for platform-specific compiler settingsBrad King2016-08-127-0/+77
| | | | | | | | | | Add infrastructure modules to be loaded for Clang and GNU compilers when targeting Android platforms.
| * CMakeDetermine*Compiler: Add hook to save custom compiler informationBrad King2016-08-123-0/+4
| | | | | | | | | | | | Provide a way for Platform/<os>-Determine-<lang>.cmake modules to save platform-specific information about the compiler in the configured CMake<lang>Compiler.cmake modules.
| * CMakeDetermineSystem: Load platform-specific helper modulesBrad King2016-08-122-1/+2
| | | | | | | | | | | | | | | | | | | | | | Once CMAKE_SYSTEM_NAME is known, load a platform-specific Platform/<os>-Determine module in order to enable custom determination of the other settings needed for the CMakeSystem module (e.g. CMAKE_SYSTEM_PROCESSOR). Also add a hook in Modules/CMakeSystem.cmake.in to allow platform-specific information to be saved.
* | FindCUDA: Support `2.1(2.0)` architecture notationBoris Fomitchev2016-08-231-4/+4
| | | | | | | | Also tweak some messages and comments.
* | FindCUDA: Take NVCC include directories from target propertiesPeter Boettcher2016-08-162-22/+27
| | | | | | | | | | | | | | | | Fixes issue where include directories specified on the target are not passed on to NVCC. This includes both target_include_directories() as well as include directories added by dependency chaining. Closes: #14201
* | Merge topic 'ExternalProject-SOURCE_SUBDIR'Brad King2016-08-161-5/+23
|\ \ | | | | | | | | | | | | a8345d65 ExternalProject: Add SOURCE_SUBDIR option
| * | ExternalProject: Add SOURCE_SUBDIR optionMatthew Woehlke2016-08-161-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new SOURCE_SUBDIR option to ExternalProject_Add that allows specifying the location of the CMakeLists.txt to use as the project root relative to the SOURCE_DIR. This is helpful for projects that have unusual layouts, or projects that provide both a superbuild and project-only build depending on which CMakeLists.txt is used. Fixes: #15118
* | | Merge topic 'FindMatlab-mingw'Brad King2016-08-161-1/+5
|\ \ \ | | | | | | | | | | | | | | | | 8ba204a6 FindMatlab: Use pre-built libraries for MinGW if needed
| * | | FindMatlab: Use pre-built libraries for MinGW if neededSebastian Niemann2016-08-151-1/+5
| | |/ | |/|
* | | Merge topic 'issue-tracker-urls'Brad King2016-08-166-8/+9
|\ \ \ | | | | | | | | | | | | | | | | 2bdba83e issues: update references to the CMake issue tracker
| * | | issues: update references to the CMake issue trackerBen Boeckel2016-08-156-8/+9
| |/ / | | | | | | | | | | | | References to specific comments are left as-is since comments were not migrated.
* | | Merge topic 'FindCUDA-fixes'Brad King2016-08-151-9/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | 1aa5c1be FindCUDA: Fix missing librt on Linux when using static cuda runtime. aab1f6e9 FindCUDA: Restore default behavior of CUDA_USE_STATIC_CUDA_RUNTIME
| * | | FindCUDA: Fix missing librt on Linux when using static cuda runtime.Stephen Sorley2016-08-121-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Commit 7229ae72 (FindCUDA: Refactor Android(Tegra) support, 2016-04-19) changed the logic to only add librt to the link line for CUDA versions 6.5 and older. However, newer versions of CUDA still require librt.
| * | | FindCUDA: Restore default behavior of CUDA_USE_STATIC_CUDA_RUNTIMEStephen Sorley2016-08-121-3/+4
| |/ / | | | | | | | | | | | | | | | | | | Fix bug introduced by commit 7229ae72 (FindCUDA: Refactor Android(Tegra) support, 2016-04-19). `CUDA_USE_STATIC_CUDA_RUNTIME` should be enabled by default if `cudart_static` is available, and silently disabled if it is not.
* | | Merge topic 'GetPrerequisites-fix-regression'Brad King2016-08-151-2/+6
|\ \ \ | |/ / |/| | | | | | | | a2d5c25a GetPrerequisites: Fix regression in gp_resolved_file_type
| * | GetPrerequisites: Fix regression in gp_resolved_file_typeBrad King2016-08-121-2/+6
| |/ | | | | | | | | | | | | | | | | | | Since commit v3.6.0-rc1~287^2 (GetPrerequisites: Fix gp_resolved_file_type on non-canonical paths, 2016-03-08) we accidentally convert relative paths (e.g. system dll file names) to absolute paths even when we do not know the base directory. Fix this by canonicalizing only paths that are already absolute. Closes: #16240
* | Merge topic '15687-xcode-support-system-include'Brad King2016-08-101-0/+1
|\ \ | | | | | | | | | | | | 93ac2a78 Xcode: Obey SYSTEM keyword for includes (#15687)
| * | Xcode: Obey SYSTEM keyword for includes (#15687)Gregor Jasny2016-08-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake used to put all header search paths into HEADER_SEARCH_PATHS attribute. Unfortunately this attribute does not support to declare a search path as a system include. As a hack one could add a -isystem /path to the cflags but then include ordering is not deterministic. A better approach was chosen with this patch by not filling HEADER_SEARCH_PATHS at all and to populate the C, C++, and Fortran flags directly. The include paths used by Xcode should be now identical to the ones used by Unix Makefiles and Ninja generator.
* | | NAG: Use -PIC for Fortran position-independent executable codeNeil Carlson2016-08-091-0/+1
|/ / | | | | | | | | | | | | | | | | The Numerical Algorithms Group (NAG) Fortran compiler documents -PIC for position-independent code and does not have a separate option for PIE. We added `-PIC` for PIC in commit v2.8.11~174^2 (NAG: Use -PIC for Fortran position-independent code, 2013-02-18). Follow up for PIE. Closes: #16236
* | Merge topic 'fix-string-append'Brad King2016-08-095-5/+5
|\ \ | | | | | | | | | | | | | | | 551b4c90 Revert the use of string(APPEND) in .cmake.in files 3a7be4f3 prefer list(APPEND) over string(APPEND) where appropriate
| * | Revert the use of string(APPEND) in .cmake.in filesDaniel Pfeifer2016-08-083-3/+3
| | | | | | | | | | | | | | | The generated files may be consumed by older cmake versions which do not support string(APPEND).
| * | prefer list(APPEND) over string(APPEND) where appropriateDaniel Pfeifer2016-08-082-2/+2
| | |
* | | Merge topic 'GetPrerequisites-grep-a'Brad King2016-08-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 5f3c8f6a GetPrerequisites: Always filter objdump output as text
| * | | GetPrerequisites: Always filter objdump output as textAlexander Shishenko2016-08-081-1/+1
| |/ / | | | | | | | | | | | | | | | When using `grep` to filter the output, add the `-a` flag to tell it never to treat the output as binary. Otherwise when LANG != C in the environment the non-ascii text may break the filter.
* | | Merge topic 'wix-custom-install-dir'Brad King2016-08-091-0/+17
|\ \ \ | |/ / |/| | | | | | | | 17bbf6af CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER feature
| * | CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER featureMichael Stürmer2016-08-081-0/+17
| | | | | | | | | | | | | | | The new variable allows setting of a custom absolute installation prefix outside of the ProgramFiles folders.
* | | Merge topic 'update-cle-version-info'Brad King2016-08-082-4/+14
|\ \ \ | | | | | | | | | | | | | | | | e52302d6 CrayLinuxEnvironment: Add alternative methods to get version info
generated by cgit v0.12 at 2025-01-25 07:02:30 (GMT)