summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'add-cmake_reset_check_state'Brad King2013-07-311-5/+28
|\ | | | | | | | | 9349d69 Add cmake_reset_check_state() macro
| * Add cmake_reset_check_state() macroVadim Zhukov2013-07-311-5/+28
| | | | | | | | | | | | | | It's acknowledged that check state should not generally nest, so it should be cleared when used, for example, in Find* module. Also, add optional RESET argument to cmake_push_check_state().
* | Merge topic 'PrintHelperFunctions'Brad King2013-07-291-0/+146
|\ \ | | | | | | | | | | | | e32ff96 add macros cmake_print_properties() and cmake_print_variables()
| * | add macros cmake_print_properties() and cmake_print_variables()Alex Neundorf2013-07-271-0/+146
| |/ | | | | | | | | | | | | | | | | This patch adds the file CMakePrintHelpers.cmake, which provides the macros (functions) cmake_print_properties() and cmake_print_variables(), which are useful e.g. for debugging and make inspecting target (or other) properties easier. Alex
* | Merge topic 'FindPNG-dbg-rel'Brad King2013-07-291-3/+30
|\ \ | | | | | | | | | | | | 2a79753 FindPNG: improve library detection (#14301)
| * | FindPNG: improve library detection (#14301)Rolf Eike Beer2013-07-271-3/+30
| |/ | | | | | | | | | | | | -add support for upcoming version 1.7 -improve version selection, use the major and minor of the requested version to generate the library suffix list -support detection of release and debug libraries
* | Merge topic 'DocumentGraphvisOptions'Brad King2013-07-291-0/+83
|\ \ | | | | | | | | | | | | | | | 692ecf4 graphvizoptions: add copyright notice ee32673 Add documentation for the --graphviz support
| * | graphvizoptions: add copyright noticeAlex Neundorf2013-07-261-0/+14
| | | | | | | | | | | | Alex
| * | Add documentation for the --graphviz supportAlex Neundorf2013-07-261-0/+69
| |/ | | | | | | | | | | | | This patch adds Modules/CMakeGraphVizOptions.cmake, which is used only for generating documentation for the --graphviz support. Alex
* | Merge topic 'minor-cleanups'Brad King2013-07-291-6/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b8dc7fa Genex: Disallow LINKER_LANGUAGE only when used on a static library. c8a10ba cmTarget: Fix iface libraries and languages for static libraries. f94bdb3 cmTarget: Remove duplicates when printing traces of tll signatures ff3d5fa Export: Fix typo of LINK_INTERFACE_LIBRARIES. 79a7a81 Docs: Document variables for default visibility values. 6f6391b Docs: Generalize and de-duplicate VISIBILITY_PREFIX docs. d8cb47f Docs: Trim trailing whitespace in generated doc. f10e648 Docs: Document existing target property debugging options. 4f4d69f Qt4Macros: Simplify some variable population. a413a40 Qt4Macros: Remove undefined varible use. b60a29e Qt4Macros: Remove unneeded generate CONDITION. e454cba Docs: Document file(GENERATE) CONDITION as optional.
| * | Qt4Macros: Simplify some variable population.Stephen Kelly2013-07-261-4/+2
| | |
| * | Qt4Macros: Remove undefined varible use.Stephen Kelly2013-07-261-1/+1
| | | | | | | | | | | | | | | This may have been added in anticipation of processing COMPILE_OPTIONS, but as moc does not accept them, there is no need for it.
| * | Qt4Macros: Remove unneeded generate CONDITION.Stephen Kelly2013-07-261-1/+0
| | |
* | | Merge topic 'FindGTK2Debug'Brad King2013-07-291-83/+92
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 32cf738 FindGTK2: Remove GTK2_SKIP_MARK_AS_ADVANCED option a874142 FindGTK2: Update local changelog cd2d9c7 FindGTK2: Append _INCLUDE_DIR to var name in _GTK2_FIND_INCLUDE_DIR 732324f FindGTK2: Append _LIBRARY to var name in _GTK2_FIND_LIBRARY 03bd3d1 FindGTK2: Use GTK_XXX_LIBRARY_DEBUG libraries in debug mode
| * | FindGTK2: Remove GTK2_SKIP_MARK_AS_ADVANCED optionDaniele E. Domenichelli2013-07-291-9/+2
| | | | | | | | | | | | | | | Variables are now automatically marked as advanced by SelectLibraryConfigurations
| * | FindGTK2: Update local changelogDaniele E. Domenichelli2013-07-291-0/+9
| | |
| * | FindGTK2: Append _INCLUDE_DIR to var name in _GTK2_FIND_INCLUDE_DIRDaniele E. Domenichelli2013-07-291-35/+35
| | | | | | | | | | | | | | | This is to keep _GTK2_FIND_INCLUDE_DIR and _GTK2_FIND_LIBRARY coherent after previous commit
| * | FindGTK2: Append _LIBRARY to var name in _GTK2_FIND_LIBRARYDaniele E. Domenichelli2013-07-291-39/+36
| | | | | | | | | | | | | | | This avoids to get the base name using a regexp, in order to use SelectLibraryConfigurations
| * | FindGTK2: Use GTK_XXX_LIBRARY_DEBUG libraries in debug modeDaniele E. Domenichelli2013-07-291-17/+27
| |/ | | | | | | | | | | | | If the GTK_XXX_LIBRARY_DEBUG library is available, it is now used when linking in debug mode XXX. A new set of variables GTK_XXX_LIBRARY_RELEASE is added and the original GTK_XXX_LIBRARY uses the optimized/debug syntax.
* | Merge topic 'Qt4-INTERFACE_LINK_LIBRARIES'Brad King2013-07-261-0/+5
|\ \ | | | | | | | | | | | | 0f267c0 FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets.
| * | FindQt4: Populate the INTERFACE_LINK_LIBRARIES of IMPORTED targets.Stephen Kelly2013-07-251-0/+5
| | | | | | | | | | | | | | | This makes the IMPORTED_LINK_INTERFACE_LIBRARIES_<CONFIG> properties obsolete.
* | | Merge topic 'doc-check-compiler-flag-override'Brad King2013-07-262-5/+7
|\ \ \ | |_|/ |/| | | | | | | | 3e79d65 Check*CompilerFlag: Document use of CMAKE_REQUIRED_DEFINITIONS (#14309)
| * | Check*CompilerFlag: Document use of CMAKE_REQUIRED_DEFINITIONS (#14309)Brad King2013-07-252-5/+7
| |/ | | | | | | | | Explain how CMAKE_REQUIRED_DEFINITIONS is set before calling the check_*_source_compiles macros.
* | Merge topic 'fix-FindQt4-available-modules'Brad King2013-07-251-1/+1
|\ \ | |/ |/| | | | | d57c1c1 FindQt4: Re-add QAxServer to the QT_MODULES.
| * FindQt4: Re-add QAxServer to the QT_MODULES.Stephen Kelly2013-07-241-1/+1
| | | | | | | | | | This was removed instead of moved in commit b8af46cb (FindQt4: Don't fail if certain Qt modules are unavailable.).
* | Merge topic 'FindCuda_more_search_paths'Brad King2013-07-241-1/+5
|\ \ | | | | | | | | | | | | 09f00a6 FindCUDA: Search for libraries in <prefix>/lib/<arch>/nvidida-current.
| * | FindCUDA: Search for libraries in <prefix>/lib/<arch>/nvidida-current.Robert Maynard2013-07-221-1/+5
| | | | | | | | | | | | | | | | | | Ubuntu install the CUDA libraries into a location that is different than the default location provided by the NVidia installer. So we teach the FindCUDA package to also find the Ubuntu install location.
* | | Merge topic 'fix-FindQt4-available-modules'Brad King2013-07-241-18/+12
|\ \ \ | | |/ | |/| | | | | | | 969e7ee FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286)
| * | FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286)Stephen Kelly2013-07-241-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression introduced by commit b8af46cb (FindQt4: Don't fail if certain Qt modules are unavailable., 2013-05-23) The _FOUND variable is set by the _QT4_ADJUST_LIB_VARS macro, so invoke that unconditionally, and guard only the set_property calls, as described in the original bug report (#14165).
* | | Merge topic 'SelectLibraryConfigurations'Brad King2013-07-221-44/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | 04d4dc3 SelectLibraryConfigurations: Use -NOTFOUND instead of copying the vars 07b44e7 SelectLibraryConfigurations: Do not cache the _LIBRARY variable
| * | | SelectLibraryConfigurations: Use -NOTFOUND instead of copying the varsDaniele E. Domenichelli2013-07-221-40/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one of the libraries (_DEBUG or _RELEASE) is not set, the value is set to the value of the other one. FindQt4, from which the macro is extracted, sets the values to XXX_LIBRARY_{DEBUG,RELEASE}-NOTFOUND instead. In both cases the XXX_LIBRARY is correct, but using NOTFOUND makes it easier to understand which one is missing. Update Tests/CMakeOnly/SelectLibraryConfigurations with the new logic.
| * | | SelectLibraryConfigurations: Do not cache the _LIBRARY variableDaniele E. Domenichelli2013-07-101-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SelectLibraryConfigurations module currently cache and mark as advanced the variable ${basename}_LIBRARY. ${basename}_LIBRARY_RELEASE and ${basename}_LIBRARY_DEBUG are usually cached, because they often come from find_library(). ${basename}_LIBRARY on the other hand is always of type "optimized;${${basename}_LIBRARY_RELEASE};debug;${${basename}_LIBRARY_DEBUG}" or just "${basename}_LIBRARY_RELEASE" or "${basename}_LIBRARY_DEBUG" if only one version of the library is not found, if both have the same value, or if configuration types are not supported. Caching and marking as advanced just ${basename}_LIBRARY_RELEASE and ${basename}_LIBRARY_DEBUG is enough, just by modifying these two variables, the user has enough control on finding the library, and having 3 variables is redundant and confusing.
* | | | Merge topic 'cpack-wix'Brad King2013-07-221-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf23891 CPackWIX: Add support for custom WiX templates 155bb01 CMakeCPack: Provide an upgrade guid for WiX bfa2e29 CPackWIX: Add option to specify the language(s) of the installer 6e51ea9 CPackWIX: Handle multiple shortcuts in the start menu 6d77e1a CPackWIX: Fix MSI package layout regression from parent 8c0e325 CPackWIX: Handle CPACK_PACKAGE_EXECUTABLES (#13967)
| * | | | CPackWIX: Add support for custom WiX templatesAdam J. Weigold2013-07-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WiX provides a lot of functionality for installers that cannot be supported (easily) in the default WIX.template.in file. For most users, the default template should be fine. However if users want to produce merge modules, include custom actions, etc, this new option allows for a hook into how the wxs is produced.
| * | | | CPackWIX: Add option to specify the language(s) of the installerRichard Ulrich2013-07-191-0/+11
| | | | | | | | | | | | | | | | | | | | Add option "CPACK_WIX_CULTURES".
| * | | | CPackWIX: Handle CPACK_PACKAGE_EXECUTABLES (#13967)Fredrik Axelsson2013-07-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Add start menu items including an uninstall shortcut. Add variable CPACK_WIX_PROGRAM_MENU_FOLDER to configure folder name.
* | | | | MinGW: Find mingw32-make included with Code::Blocks IDE (#14302)Jason Spiro2013-07-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one installs MinGW using the Code::Blocks IDE installer it goes to a path like "c:\Program Files\CodeBlocks\MinGW", not "c:\MinGW". Use the CodeBlocks registry entry to get the location. Signed-off-by: Jason Spiro <jasonspiro4@gmail.com>
* | | | | Merge topic 'abi-check-tolerate-COPY_FILE-failure'Brad King2013-07-181-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4dc4018 Teach compiler ABI check to tolerate try_compile COPY_FILE failure
| * | | | | Teach compiler ABI check to tolerate try_compile COPY_FILE failureBrad King2013-07-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CMakeDetermineCompilerABI we use try_compile with the COPY_FILE option to get a copy of the compiled binary used to detect the ABI information. We already tolerate the case when compilation fails. However, when compilation appears to succeed but does not produce the expected executable the try_compile command immediately reports an error because the COPY_FILE fails. Tolerate COPY_FILE failure without stopping the overall configuration process by using the try_compile COPY_FILE_ERROR option to capture the error message. Log the full error to CMakeError.log and simply report failure to detect the ABI as if compilation had failed. Teach the RunCMake.Configure test to cover this case and verify that the messages show up as expected both in stdout and in CMakeError.log.
* | | | | | Merge topic 'UseJava-copyright'Brad King2013-07-181-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | 53431ea UseJava: Update notice of copyright by Kitware
| * | | | | UseJava: Update notice of copyright by KitwareBrad King2013-07-171-1/+1
| | | | | |
* | | | | | Merge topic 'osx-fortran-dylib-versions'Brad King2013-07-174-0/+70
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1af8c8d OS X: Add Fortran library version flags (#14249) 2cc9f1f OS X: Add copyright notices to Darwin-*-Fortran.cmake
| * | | | | | OS X: Add Fortran library version flags (#14249)Graham Markall2013-07-164-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The linker flags for setting the compatibility and current versions of libraries on Darwin are set for the supported Fortran compilers. Set CMAKE_Fortran_CREATE_SHARED_LIBRARY for the NAG Fortran compiler to have no space after <SONAME_FLAG> so the NAG compiler can parse the argument correctly.
| * | | | | | OS X: Add copyright notices to Darwin-*-Fortran.cmakeBrad King2013-07-163-0/+39
| | | | | | |
* | | | | | | Merge topic 'UseJava-response-file'Brad King2013-07-171-1/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | 177c051 UseJava: Pass sources to javac using response file (#13028)
| * | | | | | UseJava: Pass sources to javac using response file (#13028)Graham Markall2013-07-161-1/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The command line string passed to javac can exceed the 8191-character limit on Windows when there are a large number of files to compile. To avoid this, the list of sources is written to a file which is then passed to javac as an argfile. Spaces in paths are dealt with by enclosing each file in quotes, and separating files with a newline.
* | | | | | Merge topic 'FindPNG-1.6'Brad King2013-07-161-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96fa4a2 FindPNG: Add versioned library names for 1.6 (#14289)
| * | | | | | FindPNG: Add versioned library names for 1.6 (#14289)Brad King2013-07-151-1/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | While at it, refactor the versioned library name list generation to reduce duplication.
* | | | | | Merge topic 'obsolete-qt4-macros'Brad King2013-07-162-0/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb7f32f Mark qt4_use_modules and qt4_automoc as obsolete.
| * | | | | | Mark qt4_use_modules and qt4_automoc as obsolete.Stephen Kelly2013-07-142-0/+24
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | The QT_QMAKE_EXECUTABLE has to be passed through the cmake calls because the executable may not be in the PATH.
generated by cgit v0.12 at 2025-01-10 11:27:11 (GMT)