summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | | Merge topic 'vs-no-indirect-output'Brad King2013-07-162-3/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 45d2966 VS: Avoid leaking child process output back to IDE (#14266)
| * | | VS: Avoid leaking child process output back to IDE (#14266)Brad King2013-07-162-3/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS IDE sets the environment variable VS_UNICODE_OUTPUT when executing build rules in order to tell MS tools to report output through a back door instead of through stdout/stderr. Unset this variable so that CMake can capture or properly redirect all output from processes it runs even when running inside a VS IDE build environment. This generalizes the special cases fixed by commit 80d045b0 (When GetPrerequisites.cmake runs dumpbin while running inside the VS IDE..., 2008-05-01) and commit 44aff73d (ExternalProject: Avoid bleed-through output when logging, 2011-01-06), so drop special handling of VS_UNICODE_OUTPUT in those instances.
* | | Merge topic 'revert-CMAKE_SYSROOT'Brad King2013-07-151-1/+0
|\ \ \ | | | | | | | | | | | | | | | | 0416c94 Revert "Use --sysroot when cross compiling."
| * | | Revert "Use --sysroot when cross compiling."Stephen Kelly2013-07-121-1/+0
| |/ / | | | | | | | | | | | | | | | | | | This reverts commit de4da665d3205afa239749c41513a315c3831f51. This feature is not yet ready for release. It needs to be merged with the CMAKE_OSX_SYSROOT feature.
* | | Merge topic 'doc-ExternalProject-COMMAND-keyword'Brad King2013-07-151-0/+9
|\ \ \ | | | | | | | | | | | | | | | | 93c1165 ExternalProject: Document multiple COMMAND lines
| * | | ExternalProject: Document multiple COMMAND linesBrad King2013-07-081-0/+9
| |/ / | | | | | | | | | | | | | | | | | | We support multiple commands per external project step by using the COMMAND keyword. Document this behavior and show an example. While at it, document that shell operators and current working directory behavior is not defined.
* | | Merge topic 'CPack-fixGeneratedChangelogFormat'Brad King2013-07-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 976e51d CPackRPM make the changelog line conform to expected format
| * | | CPackRPM make the changelog line conform to expected formatEric NOULARD2013-07-081-1/+1
| |/ /
* | | CPackRPM protect '@' character in filename processed in the spec file.Eric NOULARD2013-07-051-0/+10
|/ /
* | Merge topic 'Fortran-explicit-types'Brad King2013-07-021-1/+1
|\ \ | | | | | | | | | | | | 7b5bc2c Fortran: Use explicit type in Fortran 90 check
| * | Fortran: Use explicit type in Fortran 90 checkBrad King2013-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CMakeTestFortranCompiler we build a test program using a Fortran 90 construct to check whether the compiler supports the language. Some compilers have options to require explicit variable types. Fix the test program to use an explicit variable type so it passes under such a configuration. Suggested-by: Neil Carlson <neil.n.carlson@gmail.com>
* | | Merge topic 'FindGTK2vd2'Brad King2013-07-021-0/+17
|\ \ \ | | | | | | | | | | | | | | | | 60e4555 FindGTK2: Add GTK2_DEFINITIONS variable
| * | | FindGTK2: Add GTK2_DEFINITIONS variableDaniele E. Domenichelli2013-06-291-0/+17
| | | | | | | | | | | | | | | | | | | | According to https://wiki.gnome.org/gtkmm/MSWindows on MSVC the /vd2 flag should be passed to the compiler in order to use gtkmm
* | | | Merge topic 'FindGTK2vs11'Brad King2013-07-021-0/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | eb16301 FindGTK2: Do not fail on MSVC11 if vc100 libraries are available
| * | | FindGTK2: Do not fail on MSVC11 if vc100 libraries are availableDaniele E. Domenichelli2013-06-291-0/+3
| |/ /
* | | Merge topic 'vs12-generator'Brad King2013-07-014-1/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a76d83 VS12: Find proper MSBuild for VSProjectInSubdir test 4e5cb39 Merge branch 'master' into vs12-generator 78fdbbc FindBoost: Add -vc120 mangling for VS 12 e99d7b1 VS12: Generate flag tables from MSBuild v120 tool files 77ac9b8 VS12: Add Visual Studio 12 generator (#14251)
| * \ \ Merge branch 'master' into vs12-generatorBrad King2013-06-2872-332/+724
| |\ \ \ | | |/ / | | | | | | | | | | | | Resolve conflicts in Tests/Preprocess/CMakeLists.txt by keeping the side from 'master'.
| * | | FindBoost: Add -vc120 mangling for VS 12Brad King2013-06-281-0/+2
| | | |
| * | | VS12: Add Visual Studio 12 generator (#14251)Brad King2013-06-283-1/+39
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy cmGlobalVisualStudio11Generator to cmGlobalVisualStudio12Generator and update version numbers accordingly. Add the VS12 enumeration value. Add module CMakeVS12FindMake to find MSBuild. Look for MSBuild in its now-dedicated Windows Registry entry. Teach the platform module Windows-MSVC to set MSVC12 and document the variable. Teach module InstallRequiredSystemLibraries to look for the VS 12 runtime libraries. Teach tests CheckCompilerRelatedVariables, Preprocess, VSExternalInclude, and RunCMake.GeneratorToolset to treat VS 12 as they do VS 10 and 11. Inspired-by: Minmin Gong <minmin.gong@gmail.com>
* | | Merge topic 'CMakeDetermineVSServicePack-vs11'Brad King2013-07-011-0/+2
|\ \ \ | |_|/ |/| | | | | | | | f449c68 CMakeDetermineVSServicePack: Add VS 11 update 3
| * | CMakeDetermineVSServicePack: Add VS 11 update 3Brad King2013-06-281-0/+2
| | |
* | | Embarcadero: Use response files only for includes, objects, and libsBrad King2013-06-271-3/+4
| | | | | | | | | | | | | | | | | | Leave other flags directly in the Makefile command lines and outside any special inline response file syntax. Otherwise Borland does not support flags with quotes in response files.
* | | Merge topic 'FindFreetype-gtkmm'Brad King2013-06-261-4/+13
|\ \ \ | | | | | | | | | | | | | | | | a34839d FindFreetype: Detect Freetype installed by GtkMM installer for win
| * | | FindFreetype: Detect Freetype installed by GtkMM installer for winDaniele E. Domenichelli2013-06-211-4/+13
| | | |
* | | | Merge topic 'COMPILER_TARGET'Brad King2013-06-263-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2d9ec1d Add compiler target compile options.
| * | | | Add compiler target compile options.Stephen Kelly2013-06-113-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For clang, this allows passing -target <triple> to the compiler, and for qcc, -V<arch> using toolchain files containing something like set(triple arm-linux-gnueabihf) set(CMAKE_C_COMPILER "/usr/bin/clang") set(CMAKE_C_COMPILER_TARGET ${triple}) set(CMAKE_CXX_COMPILER "/usr/bin/clang++") set(CMAKE_CXX_COMPILER_TARGET ${triple}) or set(arch gcc_ntoarmv7le) set(CMAKE_C_COMPILER /opt/qnx650/host/linux/x86/usr/bin/qcc) set(CMAKE_C_COMPILER_TARGET ${arch}) set(CMAKE_CXX_COMPILER /opt/qnx650/host/linux/x86/usr/bin/QCC) set(CMAKE_CXX_COMPILER_TARGET ${arch}) Both clang and qcc are inherently cross compiler( driver)s.
* | | | | Merge topic 'set-sysroot'Brad King2013-06-241-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | de4da66 Use --sysroot when cross compiling.
| * | | | | Use --sysroot when cross compiling.Stephen Kelly2013-06-071-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As CMAKE_ROOT_FIND_PATH can be a list, a new CMAKE_SYSROOT is introduced, which is never a list. The contents of this variable is passed to supporting compilers as --sysroot. It is also accounted for when processing implicit link directories reported by the compiler, and when generating RPATH information.
* | | | | Merge topic 'CMakeDetermineVSServicePack-vs11'Brad King2013-06-241-24/+21
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | 2aa62e0 CMakeDetermineVSServicePack: Add VS 11 update 1 and 2 (#14239) 1746a35 CMakeDetermineVSServicePack: Improve documentation
generated by cgit v0.12 at 2024-11-08 14:59:43 (GMT)