summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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. :(
* | | | | Merge topic 'ExternalProject-build-config-compat'Brad King2016-02-081-2/+17
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | 1b9d15c1 ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR
| * | | ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIRBrad King2016-02-051-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~32^2~1 (ExternalProject: Simplify `cmake --build` configuration passing, 2016-01-19) we use the `$<CONFIG>` generator expression to generate the `cmake --build . --config <config>` value for the default BUILD_COMMAND instead of the CMAKE_CFG_INTDIR placeholder value provided by multi-config generators. However, some projects have been abusing the old implementation detail by setting CMAKE_CFG_INTDIR themselves to get a specific configuration. Those projects should be updated to set their own BUILD_COMMAND to get non-default behavior. Meanwhile we can be compatible with their existing releases by detecting when CMAKE_CFG_INTDIR is not a generator-provided placeholder and using its value instead.
* | | | IAR: Add support for using this compiler with the Ninja generatorJuhani Simola2016-02-032-1/+5
|/ / / | | | | | | | | | | | | | | | The dependency flags require recent versions of `iccarm` and `iccavr`. The multi-rule dependency generated with `--dependencies=m` does not work well with Ninja, so use `--dependencies=ns` instead.
* | | Merge topic 'FindGit-updates'Brad King2016-02-011-13/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | fa78ee97 FindGit: Improve documentation formatting facfb52c FindGit: Document Git_FOUND, unset internal var
| * | | FindGit: Improve documentation formattingBrad King2016-01-271-8/+7
| | | |
| * | | FindGit: Document Git_FOUND, unset internal varChristoph Grüninger2016-01-271-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | * Git is called Git, not git. * FindGit sets Git_FOUND, too. * Unset internal variable git_names
* | | | UseJava: Fix documented name of `CLASSDIR` property (#15936)Brad King2016-01-261-1/+1
|/ / / | | | | | | | | | It is not `CLASS_DIR`.
* | | Merge topic 'FindBoost-1.61'Brad King2016-01-251-2/+2
|\ \ \ | | | | | | | | | | | | | | | | b94e855d FindBoost: Add support for Boost 1.61
| * | | FindBoost: Add support for Boost 1.61Sergei Nikulov2016-01-221-2/+2
| | | |
* | | | Merge topic 'FindPNG-imported-targets'Brad King2016-01-221-7/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9b08c623 FindPNG: Create an imported PNG::PNG target (#15911)
| * | | | FindPNG: Create an imported PNG::PNG target (#15911)Sam Thursfield2016-01-211-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imported targets are now the recommended way of dealing with external library dependencies. Add one for FindPNG and update documentation accordingly. Also add a test case activated by CMake_TEST_FindPNG.
* | | | | Merge topic 'fix-pkg_search_module-cache'Brad King2016-01-221-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | 40249bcc FindPkgConfig: set standard variables in the cache
| * | | | FindPkgConfig: set standard variables in the cacheBen Boeckel2016-01-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression introduced when the code was simplified to use the variable queries. Fixes #15903. Reported-by: Bernd Lörwald
* | | | | Merge topic 'add-FindXalanC'Brad King2016-01-211-0/+162
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f9e45ab9 FindXalanC: New module to find the Apache Xalan-C++ library
| * | | | | FindXalanC: New module to find the Apache Xalan-C++ libraryRoger Leigh2016-01-201-0/+162
| | | | | |
* | | | | | Merge topic 'ExternalProject-ctest-config'Brad King2016-01-211-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec00e89e ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generators 5d739a3c ExternalProject: Simplify `cmake --build` configuration passing
| * | | | | | ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generatorsBrad King2016-01-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In multi-config generators we must tell `ctest` what configuration to test. Reported-by: Taylor Braun-Jones <taylor@braun-jones.org>
generated by cgit v0.12 at 2024-11-14 13:41:05 (GMT)