summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'remove-vs6-generator'Brad King2016-03-107-99/+2
|\ | | | | | | | | | | b42866a3 Drop Visual Studio 6 generator cd9ba3ec cmLocalVisualStudio7Generator: Fix name of helper function
| * Drop Visual Studio 6 generatorBrad King2016-03-097-99/+2
| | | | | | | | | | | | This generator has been deprecated since CMake 3.3. Remove it. Update documentation, modules, and tests to drop content specific to this generator.
* | Merge topic 'clang-iframework-version'Brad King2016-03-101-1/+1
|\ \ | | | | | | | | | | | | 63c4133b OS X: Use -iframework with Clang only on version >= 3.2
| * | OS X: Use -iframework with Clang only on version >= 3.2Jean-Christophe Fillion-Robin2016-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~564^2 (OS X: Use -iframework for system framework directories, 2014-05-05) we test the version of Clang is smaller that 3.1 to see if it supports -iframework. Considering that "iframework" support has been added in clang@r142418 (Frontend: Support -iframework.) prior to clang 3.1, this made sense. That said, considering that support for multiple -iframework parameters has been added later in clang@r164607 (-iframework should allow separate arguments. ) prior to clang 3.2, this commit updates the check to enable framework support only if version is >= 3.2
* | | Merge topic 'vs-clang-cl'Brad King2016-03-103-9/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 491b41dd Help: Add notes for topic 'vs-clang-cl' ad6d27ac Tests: do not build PrecompiledHeader on Clang/C2 a0f0541f Tests: fix PDBDirectoryAndName on Clang/C2 3541af67 Tests: fix Plugin building on Clang/C2 1902c293 Tests: fix complexOneConfig building on Clang/C2 cab2ec11 Tests: fix Complex building on Clang/C2 ada3736c Tests: fix Module.GenerateExportHeader building on Clang/C2 123b7e13 Tests: fix AliasTarget building on Clang/C2 445d4d4b VS 14: Add flag map for -std= to CppLanguageStandard tag in project files 0a785eb4 Features: Clang has no cxx_decltype_incomplete_return_type in MSVC sim mode 2c2ec488 VS: in Clang/C2 toolset, setup correct compiler settings 37afe00f CMakeDetermineCompilerId: Add detection of clang.exe bundled with VS
| * | | Features: Clang has no cxx_decltype_incomplete_return_type in MSVC sim modeMariusz Pluciński2016-03-101-1/+3
| | | |
| * | | VS: in Clang/C2 toolset, setup correct compiler settingsMariusz Pluciński2016-03-101-7/+23
| | | |
| * | | CMakeDetermineCompilerId: Add detection of clang.exe bundled with VSMariusz Pluciński2016-03-101-1/+5
| | |/ | |/| | | | | | | | | | When using a clang toolset we need to find `clang.exe` instead of `cl.exe`.
* | | FindJNI: Append path only "if(EXISTS"O. Libre2016-03-091-2/+6
| | |
* | | FindJNI: Add support for Ubuntu 15.10O. Libre2016-03-091-0/+9
|/ / | | | | | | | | - Reuse JAVA_APPEND_LIBRARY_DIRECTORIES for JAVA_AWT_INCLUDE_DIRECTORIES - Append three directories /usr/lib/jvm/java-{8,7,6}-openjdk-{libarch}
* | Merge topic 'deprecate-CMakeForceCompiler'Brad King2016-03-091-8/+12
|\ \ | | | | | | | | | | | | d929c35f CMakeForceCompiler: Deprecate this module and its macros
| * | CMakeForceCompiler: Deprecate this module and its macrosBrad King2016-03-081-8/+12
| |/ | | | | | | | | | | | | | | | | | | We originally deprecated this module in commit v3.5.0-rc1~295^2 (CMakeForceCompiler: Deprecate this module and its macros, 2015-10-19). Then a use case was found to still require the module so the deprecation was reverted for CMake 3.5 by commit v3.5.0-rc3~4^2 (CMakeForceCompiler: De-deprecate until more use cases have alternatives, 2016-02-17). Since then `CMAKE_TRY_COMPILE_TARGET_TYPE` was introduced to provide an alternative solution for that use case. Deprecate the module again.
* | Merge topic 'add-FindLTTngUST'Brad King2016-03-091-0/+111
|\ \ | | | | | | | | | | | | a4194deb Add FindLTTngUST module to find LTTng-UST library
| * | Add FindLTTngUST module to find LTTng-UST libraryPhilippe Proulx2016-03-071-0/+111
| | | | | | | | | | | | | | | | | | | | | Also detect the library version number. Provide results as variables and as an imported target, LTTng::UST. Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
* | | GetPrerequisites: Fix gp_resolved_file_type on non-canonical pathsBrad King2016-03-081-0/+2
| |/ |/| | | | | | | | | | | | | | | | | Canonicalize the input paths so we treat them both consistently, in particular when comparing them via string operations. This is needed for calls like fixup_bundle("${CMAKE_INSTALL_PREFIX}/../test" ...) Suggested-by: Benjamin Ballet <bballet@ivsweb.com>
* | Merge topic 'doc-find-python-call-order'Brad King2016-03-082-6/+8
|\ \ | |/ |/| | | | | 743f2a80 FindPython{Interp,Libs}: Clarify recommended call order
| * FindPython{Interp,Libs}: Clarify recommended call orderBrad King2016-03-072-6/+8
| | | | | | | | Improve wording in our advice about how to call both of these modules.
* | Merge topic 'BundleUtilities-dylib-in-framework'Brad King2016-03-071-1/+1
|\ \ | | | | | | | | | | | | 3906ca5a BundleUtilities: Fix regression handling frameworks
| * | BundleUtilities: Fix regression handling frameworksClinton Stimpson2016-03-071-1/+1
| | | | | | | | | | | | | | | Fix logic error introduced in commit e422f738 (BundleUtilities: Fix treatment of .dylib inside .framework folders, 2016-02-11).
* | | CPackWIX: Support binary-only WiX installationsMarc Chevrier2016-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | Also fix URLUPDATEINFO -> ARPURLUPDATEINFO reference in CPACK_WIX_PROPERTY_<PROPERTY> examples. Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
* | | Merge topic 'compiler-check-message'Brad King2016-02-261-5/+1
|\ \ \ | | | | | | | | | | | | | | | | f3ac0651 Improve compiler check message on non-Make generators
| * | | Improve compiler check message on non-Make generatorsBrad King2016-02-251-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we check for a working compiler we print a message of the form: Check for working <LANG> compiler: ... At one time CMAKE_<LANG>_COMPILER was not well-defined for all generators so we printed the generator name instead of the path to the compiler. Nowadays we always know the compiler, so update the message to print it unconditionally. This is more informative than the generator name, especially when a toolset (cmake -T) is used. Suggested-by: Gregor Jasny <gjasny@googlemail.com>
* | | | Eclipse: add newer version numbersAlex Neundorf2016-02-241-0/+4
|/ / / | | | | | | | | | Alex
* | | Merge topic 'CodeBlocksParallelFlag'Brad King2016-02-241-0/+15
|\ \ \ | | | | | | | | | | | | | | | | 84ccd4f7 CodeBlocks: generate parallel project files (make -j)
| * | | CodeBlocks: generate parallel project files (make -j)Alex Neundorf2016-02-231-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done the same way as for Eclipse: cmake tries to determine the number of CPUs, and then adds the respective -jN to the make invocations in the project file. Alex
* | | | CPack/Deb Create DEBIAN directory for dpkg-shlibdepsFlorian Apolloner and John Knottenbelt2016-02-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If CMAKE_INSTALL_RPATH is set and contains $ORIGIN then dpkg-shlibdeps searches for the DEBIAN directory in order to resolve $ORIGIN in the rpath to a directory. We need to create the DEBIAN directory for this to work.
* | | | Merge topic 'de-deprecate-CMakeForceCompiler'Brad King2016-02-181-7/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | beaa4fa5 CMakeForceCompiler: De-deprecate until more use cases have alternatives
| * | | | CMakeForceCompiler: De-deprecate until more use cases have alternativesBrad King2016-02-171-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We deprecated this module in commit v3.5.0-rc1~295^2 (CMakeForceCompiler: Deprecate this module and its macros, 2015-10-19) in order to determine whether anyone still has use cases that require it. Indeed we still need to provide a way to work with toolchains that cannot link binaries without special flags. Remove the deprecation warnings until we can provide an alternative to the module for this use case.
* | | | | Merge topic 'FindCUDA-verbatim'Brad King2016-02-181-3/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1911cda0 FindCUDA: Fix regression under Visual Studio generators
| * | | | | FindCUDA: Fix regression under Visual Studio generatorsBrad King2016-02-171-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~47^2 (FindCUDA: Support special characters in path, 2016-01-15) our add_custom_command calls use VERBATIM so that CMake will automatically quote special characters correctly. However, this breaks the special `$(VCInstallDir)` placeholder used with Visual Studio generators. Since we do not support preservation of such placeholders with VERBATIM (see issue #15001) we must fall back to not using VERBATIM when the placeholder is used. A better fix would be to stop using `$(VCInstallDir)` and use the value of `CMAKE_${CUDA_C_OR_CXX}_COMPILER` instead, but that will require additional semantic and documentation changes. For now simply fix the regression with the above approach. Reported-by: Stephen Sorley <Stephen.Sorley@jhuapl.edu>
* | | | | | Merge topic 'FindwxWidgets-msys2-paths'Brad King2016-02-171-0/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf643286 FindwxWidgets: Resolve Cygwin/MSYS paths to Windows paths
| * | | | | | FindwxWidgets: Resolve Cygwin/MSYS paths to Windows pathsWayne Stambaugh2016-02-171-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use `sh wx-config` to launch the `wx-config` tool so that it can run even on Windows. Since it is always a shell script its output may use POSIX paths even on Windows. Use `cygpath` to convert to Windows paths.
* | | | | | | FindProtobuf: check versionAntonio Perez Barrero2016-02-161-2/+57
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check found libraries version to match user required version. Protobuf compiler executable version is checked to be aligned with found libraries, raising a warning message otherwise.
* | | | | | CPack/RPM support for upper cased component variablesDomen Vrankar2016-02-131-183/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPACK_* variables expect component name in upper case. CPACK_RPM_* variables expected component name to be in same case as component name. This patch adds support for CPACK_RPM_* variables with upper case component names to match the convention with CPACK_* variables and also preserves same case component names for back compatibility.
* | | | | | Merge topic 'BundleUtilities-dylib-in-framework'Brad King2016-02-121-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | e422f738 BundleUtilities: Fix treatment of .dylib inside .framework folders
| * | | | | BundleUtilities: Fix treatment of .dylib inside .framework foldersChristian Askeland2016-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The specific cause is when e.g. /Library/Frameworks/GStreamer.framework/Versions/1.0/lib/libgio-2.0.0.dylib is detected by fixup_bundle. set_bundle_key_values() interprets this as a framework, thus doing a string replace that creates an embedded_item that is equal to the original path, i.e. it is not embedded.
* | | | | | Merge topic 'FindProtobuf-select-library-config'Brad King2016-02-121-22/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51b0501a FindProtobuf: prevent redundant PROTOBUF_LIBRARIES
| * | | | | | FindProtobuf: prevent redundant PROTOBUF_LIBRARIESAntonio Perez Barrero2016-02-111-22/+23
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, the variable PROTOBUF_LIBRARIES might get redundant value for debug and optimized configurations, e.g. `optimized;/usr/lib/libprotobuf.so;debug;/usr/lib/libprotobuf.so`.
* | | | | | Merge topic 'doc-FortranCInterface-variables'Brad King2016-02-111-126/+187
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f3f75a2 FortranCInterface: Document mangling result variables publicly 47f24cbc FortranCInterface: Improve documentation formatting and organization 9d1f40cc FortranCInterface: Convert docs to a bracket comment
| * | | | | | FortranCInterface: Document mangling result variables publiclyBrad King2016-02-101-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some projects may want to use the detailed mangling information directly instead of using the FortranCInterface_HEADER function. We already provide variables encoding the mangling information, so just document them as available.
| * | | | | | FortranCInterface: Improve documentation formatting and organizationBrad King2016-02-101-70/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Organize content into sections. Define functions via explicit markup blocks so we can cross-reference them.
| * | | | | | FortranCInterface: Convert docs to a bracket commentBrad King2016-02-101-126/+127
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Use a bracket comment to hold the documentation instead of a block of line comments. This will make further updates easier.
* | | | | | More options for CTestCoverageCollectGCOVZack Galbreath2016-02-101-17/+47
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces two new options to CTestCoverageCollectGCOV. When GLOB is set we recursively search in the source & binary directories for .gcda files. Otherwise the default behavior is to parse TargetDirectories.txt for a list of locations to search. When DELETE is set we remove any .gcda file found after it has been used to generate the corresponding .gcov file. The .gcov file is also removed after the result tarball has been created. Together these two new features help support the use case of computing coverage across subprojects.
* | | | | Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile'Brad King2016-02-092-1/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e739ef7b FindCUDA: Only warn about non-existent dependency files in verbose mode
| * | | | | FindCUDA: Only warn about non-existent dependency files in verbose modeJames Bigler2016-02-082-1/+14
| | | | | |
* | | | | | Merge topic 'apple-isystem-gcc'Brad King2016-02-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b04aa31 Xcode: Disable test for system include dirs 2cae5128 Apple: Enable -isystem for GNU Compiler >= 4 (#15953)
| * | | | | | Apple: Enable -isystem for GNU Compiler >= 4 (#15953)Gregor Jasny2016-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to #4662 -isystem support was disabled for all GNU Compilers on Apple platforms. But the change was probably a just work around for a broken compiler on Tiger (see 10837#c27206). So we tighten the condition to only kick in for GCC versions earlier than 4. That should ensure sane behavior for Xcode 3.2 and later.
* | | | | | | Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile'Brad King2016-02-081-1/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 81ecc726 FindCUDA: Added some additional comments about non-existent dependency files. 4b561b4c FindCUDA: Fix for when a non-existent dependency file is found.
| * | | | | | FindCUDA: Added some additional comments about non-existent dependency files.James Bigler2016-02-051-0/+2
| | | | | | |
| * | | | | | FindCUDA: Fix for when a non-existent dependency file is found.James Bigler2016-02-051-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if a non-existent dependency file is found we set the file to "" and then do if(NOT IS_DIRECTORY "${file}"). Later we call get_filename_component on the empty file which returns basically the current build directory. Having a dependency on the current build directory is really annoying, because anything that compiles into that directory will change the file stamp and cause your files to rebuild every time you call make. :(
generated by cgit v0.12 at 2025-01-01 15:30:22 (GMT)