summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | CMakeDetermineVSServicePack: Add VS 11 update 1 and 2 (#14239)Brad King2013-06-211-1/+5
| | | | |
| * | | | CMakeDetermineVSServicePack: Improve documentationBrad King2013-06-211-24/+17
| | |/ / | |/| | | | | | | | | | | | | | | | | | Refer users to the newer CMAKE_<LANG>_COMPILER_VERSION variables. Use a more concise summary. Format the documentation to look better in the "cmake --help-module" output.
* | | | Merge topic 'FindBoost-error-reason-static'Brad King2013-06-241-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 86cbd73 FindBoost: Clarify failure on missing 'static' libs (#14235)
| * | | | FindBoost: Clarify failure on missing 'static' libs (#14235)Brad King2013-06-201-1/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Boost_USE_STATIC_LIBS is ON we may complain that Boost libraries cannot be found even when shared libraries are present. Update the error message to tell the user explicitly that we want static libraries. Suggested-by: Laurence R. McGlashan <laurence.mcglashan@gmail.com>
* | | | Merge topic 'FindX11-OSX-10.8'Brad King2013-06-241-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 488d968 FindX11: Search in /opt/X11 for OS X 10.8 (#14232)
| * | | | FindX11: Search in /opt/X11 for OS X 10.8 (#14232)Marius Schamschula2013-06-201-0/+2
| |/ / / | | | | | | | | | | | | | | | | As of Mac OS X 10.8, X11 is no longer installed under /usr/X11, but under /opt/X11.
* | | | Merge topic 'FindGTK2-tweaks'Brad King2013-06-241-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 508e8ca FindGTK2: Detect gthread library 8dca8ce FindGTK2: Move check for pangocairo in gtk module
| * | | | FindGTK2: Detect gthread libraryDaniele E. Domenichelli2013-06-191-0/+3
| | | | |
| * | | | FindGTK2: Move check for pangocairo in gtk moduleDaniele E. Domenichelli2013-06-191-2/+2
| |/ / /
* | | | UseJava.cmake: document add_jar compat shimMatthew Woehlke2013-06-171-0/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | Document the logic that parses for backward compatibility the old variables that were used to control add_jar prior to named argument support. In particular, document that the reason this logic exists is for backward compatibility, and that new features do not need to add to it.
* | | Merge topic 'FixAsmSupport'Brad King2013-06-143-4/+4
|\ \ \ | |/ / |/| | | | | | | | bc460ea asm support: adapt to changes in CMakeDetectCompiler in 2.8.10
| * | asm support: adapt to changes in CMakeDetectCompiler in 2.8.10Alex Neundorf2013-06-143-4/+4
| |/ | | | | | | | | | | | | | | This fixes #14210. In 2.8.10 CMakeDetermineCompiler.cmake was modified (or added), and now the _INIT variable must not be set to a list anymore, before it worked. Alex
* | Merge topic 'VISIBILITY_PRESET-property'Brad King2013-06-056-0/+24
|\ \ | | | | | | | | | | | | | | | cd1fa53 Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target property. 0e9f4bc Introduce target property <LANG>_VISIBILITY_PRESET
| * | Add a COMPILE_OPTION for a VISIBILITY_INLINES_HIDDEN target property.Stephen Kelly2013-06-022-0/+12
| | | | | | | | | | | | | | | | | | | | | This corresponds to the g++ and clang++ option -fvisibility-inlines-hidden on linux. On Windows with MinGW, this corresponds to -fno-keep-inline-dllexport. That option is not supported by clang currently.
| * | Introduce target property <LANG>_VISIBILITY_PRESETStephen Kelly2013-06-024-0/+12
| | | | | | | | | | | | | | | | | | This is initialized by CMAKE_<LANG>_VISIBILITY_PRESET. The target property is used as the operand to the -fvisibility= compile option with GNU compilers and clang.
* | | Merge topic 'qt4-macros-TARGET-arg'Brad King2013-06-041-38/+62
|\ \ \ | | | | | | | | | | | | | | | | 9ce60ff Qt4Macros: Allow specifying a TARGET in invokations of macros.
| * | | Qt4Macros: Allow specifying a TARGET in invokations of macros.Stephen Kelly2013-06-031-38/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That will allow things like this: find_package(Qt4) qt4_generate_moc(myfile.h moc_myfile.cpp TARGET foo) # Note, foo target doesn't # exist until below. add_library(foo ...) The qt4_generate_moc call would use the INCLUDE_DIRECTORIES from the foo target using generator expressions. Currently it reads the INCLUDE_DIRECTORIES directory property, meaning that include_directories() is required. Support for the TARGET is also added to qt4_wrap_cpp, but not qt4_automoc, as that is deprecated in favor of the AUTOMOC target property. The moc tool reports failure if the Q_INTERFACES macro is used with an argument which has not appeared with Q_DECLARE_INTERFACE, so that is the basis of the unit test. The command line arguments are now always written to a file, which is passed to moc as the @atfile. This was already the case on Windows, but now it is used everywhere. The reason for that is that it is not currently possible to expand the list of includes from a target directly in a add_custom_command invokation (though that may become possible in the future). There is not a big disadvantage to using the file anyway on unix, so having one code path instead of two is also a motivation.
* | | | Merge topic 'useless-MATCHES'Brad King2013-06-035-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cd4451d replace string(... MATCHES "^const$) with string(... STREQUAL "const")
| * | | | replace string(... MATCHES "^const$) with string(... STREQUAL "const")Rolf Eike Beer2013-06-025-7/+7
| |/ / /
* | | | Merge topic 'FindImageMagick-v6-includes'Brad King2013-06-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3de9bb4 FindImageMagick: Find v6 include dir (#14174)
| * | | | FindImageMagick: Find v6 include dir (#14174)Funda Wang2013-05-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The header files of ImageMagick are now located at <prefix>/include/ImageMagick-6 instead of <prefix>/include/ImageMagick.
* | | | | Merge topic 'SelectLibraryConfigurations-cached-library'Brad King2013-06-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a2099a8 SelectLibraryConfigurations: Fix for cached <base>_LIBRARY
| * | | | | SelectLibraryConfigurations: Fix for cached <base>_LIBRARYBjoern Thiel2013-05-281-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The line set( ${basename}_LIBRARY ) removes the normal variable, but if the corresponding cached variable is present then line list( APPEND ${basename}_LIBRARY optimized "${_libname}" ) uses that and fails. Replace the original line with set( ${basename}_LIBRARY "" ) to set the normal variable to empty instead of unsetting it.
* | | | | Merge topic 'qt4-qt5-CMAKE_AUTOMOC'Brad King2013-06-031-3/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa55751 QtAutomoc: Get the Qt version through the target link interface f776316 Use the qt5::moc imported target instead of a variable.
| * | | | | QtAutomoc: Get the Qt version through the target link interfaceStephen Kelly2013-05-271-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt 5.1, Qt5::Core has a INTERFACE_QT_MAJOR_VERSION property of '5', and since CMake 2.8.11, Qt4::QtCore has an INTERFACE_QT_MAJOR_VERSION of '4'. This was introduced in commit 4aa10cd6 (FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCore, 2013-03-16), to produce an error if Qt 4 and Qt 5 are erroneously used by the same target. This can also be used however to determine the Qt major version, and therefore the particular moc executable to use during automoc steps. This means that targets in a single buildsystem can use a selection of Qt 4 and Qt 5, and still take advantage of the CMAKE_AUTOMOC feature without conflicting.
| * | | | | Use the qt5::moc imported target instead of a variable.Stephen Kelly2013-05-271-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | The variable is provided in the Qt5 config files only for compatibility with this automoc feature, so use the more-future-proof method instead.
* | | | | Merge topic 'rpath-on-mac'Brad King2013-06-031-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc1d025 OS X: Add test for rpaths on Mac. 8576b3f OS X: Add support for @rpath in export files. 00d71bd Xcode: Add rpath support in Xcode generator. 94e7fef OS X: Add RPATH support for Mac.
| * | | | | OS X: Add RPATH support for Mac.Clinton Stimpson2013-06-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RPATH support is activated on targets that have the MACOSX_RPATH property turned on. For install time, it is also useful to set INSTALL_RPATH to help find dependent libraries with an @rpath in their install name. Also adding detection of rpath conflicts when using frameworks.
* | | | | | Merge topic 'xcode-shlib-versioning'Brad King2013-06-031-6/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | cbe3f20 Xcode: Add support for shared library versioning
| * | | | | Xcode: Add support for shared library versioningClinton Stimpson2013-05-291-6/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Add a post-build command to shared library targets to create the versioning symbolic links.
generated by cgit v0.12 at 2025-02-01 09:06:31 (GMT)