summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Clang: Add separate "AppleClang" compiler idBrad King2013-10-077-2/+17
| | | | | | | | | | | | Apple distributes their own Clang build with their own version numbers that differ from upstream Clang. Use the __apple_build_version__ symbol to identify the Apple Clang compiler and report the Apple Build Version as the fourth version component in CMAKE_<LANG>_COMPILER_VERSION. Add Compiler/AppleClang-<lang> and Platform/Darwin-AppleClang-<lang> modules that simply include the upstream equivalents. Fix comparisons of CMAKE_<LANG>_COMPILER_ID to Clang in CMake's own source and tests to account for AppleClang.
* OS X: Search system SDKs for frameworksBrad King2013-09-271-0/+9
| | | | | | | | In Modules/Platform/Darwin.cmake set CMAKE_SYSTEM_FRAMEWORK_PATH to include framework directories from inside the system SDK corresponding to CMAKE_OSX_SYSROOT. Suggested-by: Sean McBride <sean@rogue-research.com>
* Merge topic 'wince-archfam'Brad King2013-09-261-4/+11
|\ | | | | | | | | 0b15ffc MSVC: Fix WinCE arch family preprocessor symbol (#14436)
| * MSVC: Fix WinCE arch family preprocessor symbol (#14436)Patrick Gansterer2013-09-251-4/+11
| | | | | | | | | | | | | | | | | | In commit bd827f98 (Use COFF file header header for architecture detection, 2013-08-05) the MSVC_<lang>_ARCHITECTURE_ID value computed by CMakeDetermineCompilerId.cmake changed for WinCE architectures to be the exact architecture read from the PE header. Fix platform preprocessor definitions in Modules/Platform/Windows-MSVC.cmake to correspond to the architecture family (ARM or SHx) instead of the specific architecture.
* | VS: Use version-specific subsystem for WinCE compiler id (#14440)Patrick Gansterer2013-09-251-1/+5
|/ | | | | | The subsystem must be set to WINDWOSCE for some SDKs to link an executable. Set it to 9 for VS2005 and to 8 for VS2008, since the value differs between the different Visual Studio versions.
* MSVC: Fix version test for linking corelibc on Windows CE (#14420)Patrick Gansterer2013-09-231-1/+1
| | | | | | In commit 8fcf0ab0 (Add support for new Windows CE compiler, 2013-08-04) we made corelibc conditional on the MSVC version, but the version value was incorrect. Update it to use corelibc for VS 2008 and below.
* FindHDF5: Fix regression in per-configuration library selectionBrad King2013-09-191-36/+2
| | | | | | | | | | | | | | | | When FindHDF5 was first added in commit e6734068 (Add HDF5 find module..., 2009-08-24) it contained a workaround for a bug in SelectLibraryConfigurations that did not transform lists correctly. That bug was fixed by commit 5797512c (SelectLibraryConfiguration: generate correct output when input vars are lists, 2012-07-28). Then refactoring in commit 04d4dc33 (SelectLibraryConfigurations: Use -NOTFOUND instead of copying the vars, 2013-07-08) changed undocumented behavior on which the original workaround relied. The result puts entries like HDF5_hdf5_LIBRARY_DEBUG-NOTFOUND in HDF5_LIBRARIES. Fix this by dropping the original workaround since the underlying issue has been fixed anyway. Use the HDF5_${LIB}_LIBRARY selected by the call to select_library_configurations directly.
* Merge topic 'FindPNG-compatibility'Brad King2013-09-171-5/+9
|\ | | | | | | | | 6816044 FindPNG: Honor old PNG_LIBRARY if provided (#14398)
| * FindPNG: Honor old PNG_LIBRARY if provided (#14398)Brad King2013-09-131-5/+9
| | | | | | | | | | | | | | | | | | | | In commit 2a797539 (FindPNG: improve library detection, 2013-07-27) we split the search for PNG into separate PNG_LIBRARY_DEBUG and PNG_LIBRARY_RELEASE variables. However, if a project or user sets the old PNG_LIBRARY value we must honor it instead of searching. While at it, mark PNG_LIBRARY_RELEASE and PNG_LIBRARY_DEBUG as advanced and remove a stray debug message.
* | FindCUDA: Always list custom command outputs in their targetsBrad King2013-09-131-16/+1
|/ | | | | | | | | CMake's intended interface for linking to explicit object files (marked with EXTERNAL_OBJECT) is that only those listed as target sources should be linked. Drop FindCUDA's attempt to hide the .obj files from VS IDE project files, which depends on VS-version-specific behavior of linking custom command outputs that happen to be named "*.obj". CMake puts external object files in a dedicated source group anyway.
* MSVC: Drop /link from executable link lines with NinjaBrad King2013-09-111-1/+0
| | | | | | | In commit fb9f73de (MSVC: Invoke 'link' directly for executables, 2013-04-08) we forgot to remove the /link option handling added by commit e31df039 (Ninja: move <OBJECTS> in front of the first linker option, 2012-09-27) to the Platform/Windows-MSVC module. Drop it now.
* Merge topic 'FindImageMagick-hdri'Brad King2013-08-271-3/+3
|\ | | | | | | | | 5803b94 FindImageMagick: Find libraries named with HDRI support (#14348)
| * FindImageMagick: Find libraries named with HDRI support (#14348)Eric Bélanger2013-08-131-3/+3
| | | | | | | | | | When ImageMagick is built with HDRI support, the library names get a HDRI suffix.
* | Merge topic 'FindTCL-paths-for-8.6'Brad King2013-08-271-0/+2
|\ \ | | | | | | | | | | | | 141ce01 FindTCL: Add BSD paths for Tcl/Tk 8.6
| * | FindTCL: Add BSD paths for Tcl/Tk 8.6Raphael Kubo da Costa2013-08-261-0/+2
| | | | | | | | | | | | | | | | | | Follow-up to commit 4a015f77 (OpenBSD: Add paths for Tcl/Tk 8.4/8.5, 2012-12-03): those paths added for OpenBSD also work on other BSDs, some of which are already using version 8.6 of Tcl/Tk.
* | | Merge topic 'doc-check-flags'Brad King2013-08-262-0/+6
|\ \ \ | |/ / |/| | | | | | | | 293ecfe CheckC*CompilerFlag: add documentation what to expect from a positive result
| * | CheckC*CompilerFlag: add documentation what to expect from a positive resultRolf Eike Beer2013-08-132-0/+6
| |/
* | OS X: Do not default to non-existent deployment target SDKBrad King2013-08-141-2/+14
|/ | | | | | | Since commit 95f78e08 (OS X: Search for SDK based on deployment target, 2013-08-02) we select the default OS X SDK path to match the deployment target. Fix this behavior in the case that the matching SDK does not exist and fall back to the SDK for the current host OS X version.
* Revert "Add compiler target compile options."Stephen Kelly2013-08-093-7/+0
| | | | This reverts commit 2d9ec1dadfdd10043a98d425abb25d0aef117699.
* Merge topic 'wince800'Brad King2013-08-081-1/+5
|\ | | | | | | | | | | 0416a0e VS11: Add support for Windows CE SDKs 8fcf0ab Add support for new Windows CE compiler
| * Add support for new Windows CE compilerPatrick Gansterer2013-08-071-1/+5
| | | | | | | | | | The new compiler versions do not need corelibc.lib as a default link library and a architecture detection workaround.
* | Merge topic 'osx-no-command-line-tools'Brad King2013-08-073-0/+29
|\ \ | |/ |/| | | | | 03ab170 OS X: Enable command-line build without tools in PATH
| * OS X: Enable command-line build without tools in PATHBrad King2013-08-063-0/+29
| | | | | | | | | | | | | | | | | | | | Teach modules CMakeDetermineCompiler and CMakeUnixFindMake to ask Xcode where to find the compiler or make tools, using 'xcrun --find', if none is found in the PATH. Teach module Platform/Darwin to add the path to the SDK to CMAKE_SYSTEM_PREFIX_PATH so that find_* command look there. Also add the SDK /usr/include directory to the implicit include list in CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES to suppress explicit -I options for it.
* | Merge topic 'peheader'Brad King2013-08-062-7/+29
|\ \ | | | | | | | | | | | | bd827f9 WIN: Use COFF file header header for architecture detection (#14083)
| * | WIN: Use COFF file header header for architecture detection (#14083)Patrick Gansterer2013-08-052-7/+29
| | | | | | | | | | | | | | | Read the machine field from the COFF file header to get the exact target architecture for ARM and SHx on the Windows platform.
* | | Merge topic 'vs-cleanup'Brad King2013-08-064-28/+16
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | c90151b VS: Unify how the name of the generator is specified 3873d29 Fix detection of WinCE SDKs with 64bit verion of CMake 40a4302 VS12: Remove duplicated overload of UseFolderProperty() b02f09d VS: Replace ArchitectureId with PlatformName 4b15dc8 VS: Set CMAKE_VS_PLATFORM_NAME for VS7 and VS71 too 60e568c VS10: Do not set the TargetMachine when detecting the compiler dfbfe6f VS6: Hardcode id_machine_6 for compiler detection
| * | VS: Replace ArchitectureId with PlatformNamePatrick Gansterer2013-08-053-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | Since we do not need the information about the target architecture we can use the PlatformName only to specify the this information. This also removes setting of the MSVC_*_ARCHITECTURE_ID variable which is not required, because this variable gets set by the compiler detection code in CMAKE_DETERMINE_COMPILER_ID_CHECK().
| * | VS: Set CMAKE_VS_PLATFORM_NAME for VS7 and VS71 tooPatrick Gansterer2013-08-051-3/+0
| | | | | | | | | | | | | | | Move the code which sets CMAKE_VS_PLATFORM_NAME from cmGlobalVisualStudio8Generator to cmGlobalVisualStudio7Generator.
| * | VS10: Do not set the TargetMachine when detecting the compilerPatrick Gansterer2013-08-052-9/+1
| | | | | | | | | | | | | | | | | | | | | The Microsoft linker is intelligent enough to detect the target machine type depending on the input files. This allows us to get the target architecture from the compiler instead of maintaining the mapping to the platform name.
| * | VS6: Hardcode id_machine_6 for compiler detectionPatrick Gansterer2013-08-052-4/+3
| | | | | | | | | | | | | | | id_machine6 is never set to an other value than x86. So it is safe to remove the replacements with "x86" directly.
* | | Merge topic 'osx-find-sdk-for-deployment-target'Brad King2013-08-051-1/+5
|\ \ \ | |/ / |/| / | |/ | | | | bf5a5bc bootstrap: Do not suppress CMAKE_OSX_SYSROOT if CFLAGS have -isysroot (#14324) 95f78e0 OS X: Search for SDK based on deployment target (#14324)
| * OS X: Search for SDK based on deployment target (#14324)Brad King2013-08-021-1/+5
| | | | | | | | | | | | | | | | When available, use CMAKE_OSX_DEPLOYMENT_TARGET instead of the host OS X version to select the default SDK. This makes sense because one should use the SDK matching the deployment target. Suggested-by: John Ralls <jralls@ceridwen.us>
* | FindGTK2: Detect pangoft2 and pangoxft librariesDaniele E. Domenichelli2013-08-011-1/+5
|/
* FindGTK2: Detect gmodule libraryDaniele E. Domenichelli2013-07-311-0/+3
|
* FindGTK2: gthread-2.0 folder does not existDaniele E. Domenichelli2013-07-311-1/+0
| | | | Partially revert commit 508e8ca024e47baea342da85c7bbd014c7fd6c30
* Merge topic 'static_library_flags'Brad King2013-07-311-0/+22
|\ | | | | | | | | | | | | | | | | | | 33e6e0b VS6: Add handling of CMAKE_*_LINKER_FLAGS_<CONFIG> variables 152dfda Add additonal tests for the linker flags 20ed496 Add documentation for the missing CMAKE_*_LINKER_FLAGS_* variables 54f7019 Add CMAKE_STATIC_LINKER_FLAGS to CMakeCommonLanguageInclude 2a43c30 Add support for CMAKE_STATIC_LINKER_FLAGS 14bbf83 Unify the way the flags of a static library are read
| * Add CMAKE_STATIC_LINKER_FLAGS to CMakeCommonLanguageIncludePatrick Gansterer2013-07-311-0/+22
| | | | | | | | | | | | Add support for CMAKE_STATIC_LINKER_FLAGS_* to CMakeCommonLanguageInclude.cmake to set the defaults similar to the other CMAKE_*_LINKER_FLAGS_*.
* | 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
| | |
View Lorry Controller Status