summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CMAKE_CXX_KNOWN_FEATURES-global-property'Brad King2014-05-061-1/+4
|\ | | | | | | | | 3fdfa5d3 Features: Make CMAKE_CXX_KNOWN_FEATURES a property.
| * Features: Make CMAKE_CXX_KNOWN_FEATURES a property.Stephen Kelly2014-05-021-1/+4
| | | | | | | | | | As a 'built-in' variable it imposes a cost on all variable lookups and it is expected to be rarely used.
* | Merge topic 'dont-rewrite-moc-parameter-file'Brad King2014-05-061-1/+3
|\ \ | |/ |/| | | | | | | 17c31b8b Qt4: Extend the Qt4Targets test to cover dir and target moc parameters. 6a5bd7f0 Qt4: write moc parameter file only when content has changed
| * Qt4: write moc parameter file only when content has changedPeter Kümmel2014-04-251-1/+3
| |
* | Merge topic 'FindCUDA-cubin-fatbin'Brad King2014-05-011-29/+60
|\ \ | | | | | | | | | | | | | | | 80209fdb Help: Add notes for topic 'FindCUDA-cubin-fatbin' 231b30db FindCUDA: Add support for compilation to fatbin & cubin modules
| * | FindCUDA: Add support for compilation to fatbin & cubin modulesTobias Zirr2014-04-301-29/+60
| | |
* | | Merge topic 'ExternalProject-verify-cmake-var'Brad King2014-05-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 420280f3 ExternalProject: Fix path to cmake in verify script
| * | | ExternalProject: Fix path to cmake in verify scriptBrad King2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.0.0-rc1~103^2~3 (ExternalProject: Reattempt download when verification fails, 2014-01-15) a reference to ${CMAKE_COMMAND} was added to generate a reference to the CMake command in a cmake script. Escape the '$' so that the literal variable reference appears in the script instead of writing the path to the current cmake. This is necessary when the path to CMake contains spaces or other characters special to CMake syntax.
* | | | Merge topic 'osx-init-early'Brad King2014-04-305-137/+169
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbc358c3 Merge branch 'master' into osx-init-early 0cce556b Xcode: Use sysroot and deployment target to identify compiler 0200d0a9 OS X: Factor a Darwin-Initialize module out of Platform/Darwin 416761e3 Add platform-specific initialization step when enabling languages
| * \ \ \ Merge branch 'master' into osx-init-earlyBrad King2014-04-29124-623/+1660
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Resolve conflict in Source/cmGlobalGenerator.cxx by integrating changes from both sides.
| * | | | Xcode: Use sysroot and deployment target to identify compilerBrad King2014-04-292-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use CMAKE_OSX_SYSROOT and CMAKE_OSX_DEPLOYMENT_TARGET to set the Xcode SDKROOT and MACOSX_DEPLOYMENT_TARGET build settings. This is necessary because some versions of Xcode select a different compiler based on these settings. We need to make sure the compiler identified during language initialization matches what will be used for the actual build.
| * | | | OS X: Factor a Darwin-Initialize module out of Platform/DarwinBrad King2014-04-292-137/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize variables CMAKE_OSX_SYSROOT, CMAKE_OSX_DEPLOYMENT_TARGET, and CMAKE_OSX_ARCHITECTURES prior to enabling any languages. This will allow compiler identification to consider these values.
| * | | | Add platform-specific initialization step when enabling languagesBrad King2014-04-291-0/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Create a Modules/CMakeSystemSpecificInitialize.cmake module loaded after CMakeSystem.cmake but before per-language initialization. Use it to load an optional Platform/<os>-Initialize.cmake module. This will be useful to do per-platform initialization that does not depend on the language and use the results when enabling specific languages.
| * | | Merge branch 'implicit-libNN-dirs' into releaseBrad King2014-04-161-1/+1
| |\ \ \
* | \ \ \ Merge topic 'cxx98-features'Brad King2014-04-304-0/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | a36b957f Features: Add cxx_template_template_parameters.
| * | | | Features: Add cxx_template_template_parameters.Stephen Kelly2014-04-164-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Extend the existing feature infrastructure as needed to support both C++11 and C++98 features.
* | | | | Merge topic 'UseSWIG-go-support'Brad King2014-04-291-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | a3b1be5e UseSWIG: Add support for Go and Lua
| * | | | UseSWIG: Add support for Go and LuaJulien Schueller2014-04-291-0/+4
| | | | |
* | | | | FindGTK2: search for Fontconfig and X11 before using themRolf Eike Beer2014-04-231-4/+4
|/ / / /
* | | | Merge topic 'ExternalData-missing-not-fatal'Brad King2014-04-211-15/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ccd29b9a ExternalData: Warn on missing file instead of failing
| * | | | ExternalData: Warn on missing file instead of failingBrad King2014-04-171-15/+29
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the primary source tree path named by a DATA{} reference does not exist, produce an AUTHOR_WARNING instead of a FATAL_ERROR. This is useful when writing a new DATA{} reference to a test reference output that has not been created yet. This way the developer can run the test, manually verify the output, and then copy it into place to provide the reference and eliminate the warning. If the named source tree path is expected to be a file but exists as a directory, we still need to produce a FATAL_ERROR.
* | | | Merge topic 'autorcc-target-dir'Brad King2014-04-211-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 33774ca2 QtAutogen: Put generated qrc files in a target-specific dir.
| * | | | QtAutogen: Put generated qrc files in a target-specific dir.Stephen Kelly2014-04-181-0/+1
| |/ / /
* | | | Merge topic 'FindGTK2_fix_bsd'Brad King2014-04-211-10/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | d5a6069a FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includes ef9366b0 FindGTK2: Add /usr/X11R6/ to include paths
| * | | | FindGTK2: Add GTK2_(FONTCONFIG|X11)_INCLUDE_DIR optional includesDaniele E. Domenichelli2014-04-211-10/+26
| | | | |
| * | | | FindGTK2: Add /usr/X11R6/ to include pathsDaniele E. Domenichelli2014-04-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Should fix builds on OpenBSD, see http://open.cdash.org/viewTest.php?onlyfailed&buildid=3286713
* | | | | Merge topic 'UseSWIG-guess_module_name'Brad King2014-04-211-17/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c96192f UseSWIG: Revise and format documentation e147c5c5 UseSWIG: Detect module name from interface file (#10080)
| * | | | | UseSWIG: Revise and format documentationJulien Schueller2014-04-211-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | Also add some documentation of SWIG_MODULE_NAME.
| * | | | | UseSWIG: Detect module name from interface file (#10080)Julien Schueller2014-04-211-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no SWIG_MODULE_NAME is specified explicitly and the .i file exists, scan it for the module name declaration.
* | | | | | Merge topic 'FindGTest-typed-test'Brad King2014-04-171-9/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f3e95ba FindGTest: Teach GTEST_ADD_TESTS about TYPED_TEST
| * | | | | | FindGTest: Teach GTEST_ADD_TESTS about TYPED_TESTJack Morrison2014-04-161-9/+15
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'ar-no-replace'Brad King2014-04-173-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ec6485c Support duplicate object names in large archives (#14874)
| * | | | | | Support duplicate object names in large archives (#14874)Brad King2014-04-163-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize the change from commit 39d0ade0 (Windows-GNU: Support duplicate object names in large archives, 2014-04-14) to the default archive rules. These rules have used an incremental append approach since commit v2.8.0~1856 (Build large archives incrementally, 2008-08-04). Switch from "ar r" to "ar q" to be sure we always append objects instead of replacing them.
* | | | | | | Merge topic 'implicit-libNN-dirs'Brad King2014-04-171-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | cc57ff5c Drop /lib32 and /lib64 from link directories and RPATH (#14875)
| * | | | | Drop /lib32 and /lib64 from link directories and RPATH (#14875)Brad King2014-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES with these paths. We already have the equivalents under /usr. Systems that have these directories have their dynamic loaders configured already. Do not allow them to appear in the RPATH explicitly.
* | | | | | Merge topic 'cxx11-features'Brad King2014-04-151-0/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60c0d2dd Features: Add cxx_defaulted_move_initializers. c4e67235 Features: Add cxx_long_long_type. dcaafada Features: Add cxx_func_identifier. 251a1f02 Features: Add cxx_local_type_template_args. 53fe7773 Features: Add cxx_extended_friend_declarations. 16603f7c Features: Add cxx_enum_forward_declarations. adf22f61 Features: Add cxx_default_function_template_args. 7b3e8a05 Features: Add cxx_right_angle_brackets. 9a49fd21 Features: Add cxx_decltype_incomplete_return_types. 1889045c Features: Add cxx_sizeof_member. ab455eba Features: Add cxx_thread_local. 300ce248 Features: Add cxx_inline_namespaces. f9d04a96 Features: Add cxx_variadic_macros. 3d76656f Features: Add cxx_uniform_initialization. e74b216c Features: Add cxx_generalized_initializers. ff80c3b4 Features: Add cxx_attributes. ...
| * | | | | | Features: Add cxx_defaulted_move_initializers.Stephen Kelly2014-04-081-0/+1
| | | | | | |
| * | | | | | Features: Add cxx_long_long_type.Stephen Kelly2014-04-081-0/+1
| | | | | | |
| * | | | | | Features: Add cxx_func_identifier.Stephen Kelly2014-04-081-0/+1
| | | | | | |
| * | | | | | Features: Add cxx_local_type_template_args.Stephen Kelly2014-04-081-0/+1
| | | | | | |
| * | | | | | Features: Add cxx_extended_friend_declarations.Stephen Kelly2014-04-081-0/+1
| | | | | | |
| * | | | | | Features: Add cxx_enum_forward_declarations.Stephen Kelly2014-04-081-0/+1
| | | | | | |
| * | | | | | Features: Add cxx_default_function_template_args.Stephen Kelly2014-04-081-0/+1
| | | | | | |
| * | | | | | Features: Add cxx_right_angle_brackets.Stephen Kelly2014-04-081-0/+1
| | | | | | |
| * | | | | | Features: Add cxx_decltype_incomplete_return_types.Stephen Kelly2014-04-081-2/+3
| | | | | | |
| * | | | | | Features: Add cxx_sizeof_member.Stephen Kelly2014-04-081-0/+1
| | | | | | |
| * | | | | | Features: Add cxx_thread_local.Stephen Kelly2014-04-081-0/+1
| | | | | | |
| * | | | | | Features: Add cxx_inline_namespaces.Stephen Kelly2014-04-081-0/+1
| | | | | | |
| * | | | | | Features: Add cxx_variadic_macros.Stephen Kelly2014-04-081-0/+2
| | | | | | |
| * | | | | | Features: Add cxx_uniform_initialization.Stephen Kelly2014-04-081-0/+1
| | | | | | |