summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs11-express'Brad King2012-09-192-6/+5
|\ | | | | | | | | | | 7ee3cee VS11: Add VS 2012 Express support (#13348) e17f345 VS11: Detect VS 2012 Express for default generator (#13348)
| * VS11: Add VS 2012 Express support (#13348)Brad King2012-09-182-6/+5
| | | | | | | | | | | | | | | | | | | | | | Use the registry entries that vsvars32.bat uses to detect the location of MSBuild.exe in the framework directory. Invoke MSBuild with the option /p:VisualStudioVersion=$version so it knows from which VS version to load the system build rules. Teach cmGlobalVisualStudio11Generator to set its ExpressEdition member using the registry.
* | Merge topic 'osx-clang-target-flags'Brad King2012-09-193-0/+30
|\ \ | | | | | | | | | | | | 011d5a4 OS X: Add platform-specific Clang compiler info files (#13536)
| * | OS X: Add platform-specific Clang compiler info files (#13536)Brad King2012-09-173-0/+30
| |/ | | | | | | | | | | | | | | | | | | | | Clang has the same interface as GNU except that we do not need to test for the deployment target and sysroot flags. Simply set variables CMAKE_${lang}_HAS_ISYSROOT CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG to true because every version of Clang available on OS X supports these flags.
* | Merge topic 'findsdl-unlimited-main-13262'David Cole2012-09-181-3/+5
|\ \ | | | | | | | | | | | | adf7058 FindSDL: add SDLMAIN_LIBRARY only once (#13262)
| * | FindSDL: add SDLMAIN_LIBRARY only once (#13262)Rolf Eike Beer2012-09-171-3/+5
| |/
* | Merge topic 'cleanup-TLS-and-SSL-interface'David Cole2012-09-181-20/+20
|\ \ | | | | | | | | | | | | | | | 7369a8f file(DOWNLOAD): Make TLS options behave as documented 131d91a Rename SSL terminology to TLS
| * | Rename SSL terminology to TLSBrad King2012-09-141-20/+20
| | | | | | | | | | | | | | | | | | TLS has superseded SSL so rename the recently added file(DOWNLOAD) and ExternalProject options using the newer terminology. Drop "CURLOPT" from names because curl is an implementation detail.
* | | Merge topic 'ExternalProject-check-hashes'David Cole2012-09-181-49/+76
|\ \ \ | |/ / | | | | | | | | | | | | c266461 Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add. beb8a83 ExternalProject: Generalize URL_MD5 option to URL_HASH
| * | Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add.Bill Hoffman2012-09-121-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the ability to turn on and off ssl certificate authority checking. It also adds the ability to specify a certificate authority information file. This can be done by setting global cmake variables CMAKE_CURLOPT_CAINFO_FILE and or CMAKE_CURLOPT_SSL_VERIFYPEER in the project calling ExternalProject_Add, or by passing those options to individual ExternalProject_Add calls.
| * | ExternalProject: Generalize URL_MD5 option to URL_HASHBrad King2012-09-111-49/+47
| | | | | | | | | | | | Add support for SHA algorithms.
* | | Merge topic 'openscenegraph-simplify-fphsa'David Cole2012-09-181-69/+11
|\ \ \ | | | | | | | | | | | | | | | | 248db6c FindOpenSceneGraph: simplify by using more features of FPHSA
| * | | FindOpenSceneGraph: simplify by using more features of FPHSARolf Eike Beer2012-09-121-69/+11
| | |/ | |/|
* | | Merge topic 'NewFindGLEWModule'David Cole2012-09-181-0/+30
|\ \ \ | | | | | | | | | | | | | | | | fbda7bb Initial version of find module
| * | | Initial version of find moduleBenjamin Eikel2012-09-011-0/+30
| | | |
* | | | Merge topic 'topics/FindCUDA/Add-CUDA_HOST_COMPILER'David Cole2012-09-182-7/+27
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | db207e4 FindCUDA: Added CUDA_HOST_COMPILER variable.
| * | | FindCUDA: Added CUDA_HOST_COMPILER variable.James Bigler2012-08-202-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new CUDA variable for specifying the CUDA_HOST_COMPILER. This will allow users to be able to specify which host compiler to use for invoking NVCC with. By default it will use the compiler used for host compilation. This is convenient for when you want to specify a different compiler than the default compiler. You end up using the same compiler for both the NVCC compilation and the host compilation instead of using the default compiler in the path for NVCC.
* | | | Merge topic 'FortranCrossCompiling3'Brad King2012-09-121-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7924aac CMakeDetermineFortranCompiler: add support for cross-compiling (#13379)
| * | | | CMakeDetermineFortranCompiler: add support for cross-compiling (#13379)Alex Neundorf2012-09-111-0/+26
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This adds the same support code for cross compiling to CMakeDetermineFortranCompiler as there is already in the C and CXX versions of this file. Alex
* | | | Merge topic 'CPackRPM_handleAttrDirectiveProperly-reloaded'Brad King2012-09-111-4/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d8a1dd5 Handles %attr(nnn,-,-) /path/to/file in CPACK_RPM_USER_FILELIST properly.
| * | | | Handles %attr(nnn,-,-) /path/to/file in CPACK_RPM_USER_FILELIST properly.Eric NOULARD2012-09-101-4/+10
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | This triggered an unknown secondary bug when there is no ABSOLUTE INSTALL file. This is fixed as well. This is based on a fix of bug #0013468 from Viktor Dubrovsky.
* | | | Merge topic 'include-FPHSA'Brad King2012-09-114-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ff0d1a8 include FPHSA from current directory in all modules
| * | | | include FPHSA from current directory in all modulesRolf Eike Beer2012-09-084-6/+6
| |/ / /
* | | | Merge topic 'gettext-no-duplicate-FPHSA'Brad King2012-09-111-8/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 656ab19 FindGettext: remove code duplicating FPHSA checks
| * | | | FindGettext: remove code duplicating FPHSA checksRolf Eike Beer2012-09-081-8/+1
| |/ / /
* | | | Merge topic 'fix-qt-dbus-on-mac-problem'Brad King2012-09-111-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5c25df1 FindQt4: Avoid "finding" non-existent library in a .framework
| * | | | FindQt4: Avoid "finding" non-existent library in a .frameworkDavid Cole2012-09-061-0/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | ...if the library file does not exist inside the .framework then do not allow a library variable to be set to the path to the framework. Force set it to NOTFOUND instead.
* | | | Merge topic 'findfreetype-13502'Brad King2012-09-111-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9d91fc6 fix for discovering ft2build.h using FREETYPE_DIR environment var (#13502)
| * | | | fix for discovering ft2build.h using FREETYPE_DIR environment var (#13502)Sergei Nikulov2012-09-061-3/+4
| |/ / /
* | | | Merge topic 'windows-ce'Brad King2012-09-116-9/+55
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | 28d744c Add WindowsCE platform information files e7cb805 Add additional architectures to CMakePlatformId.h.in
| * | | Add WindowsCE platform information filesPatrick Gansterer2012-09-055-9/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables CMake to create Makefiles targeting Windows CE devices. CMake needs to be run within a cross compile command prompt and requires a toolchain file which sets CMAKE_SYSTEM_NAME to "WindowsCE" and optionally CMAKE_SYSTEM_VERSION.
| * | | Add additional architectures to CMakePlatformId.h.inPatrick Gansterer2012-09-051-0/+6
| |/ / | | | | | | | | | Detect the MIPS and SHx architecture for MSVC compiler.
* | | Merge topic 'flex-version-apple'David Cole2012-09-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | af06482 FindFLEX: fix version extraction on Apple
| * | | FindFLEX: fix version extraction on AppleRolf Eike Beer2012-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | The space in 'flex 2.5.35 Apple(flex-31)' caused the version extraction to fail. Ignore everything after the first space following the version number.
* | | | Merge topic 'Qt4Macros-fix-resource-parsing'David Cole2012-09-041-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 42bfc5a Read entire Qt4 qrc file when parsing for depends info.
| * | | Read entire Qt4 qrc file when parsing for depends info.Stephen Kelly2012-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | The qrc file is an xml file, not line based, so the entire 'interesting' content to parse is not necessarily found by STRINGS and a regexp.
* | | | Merge topic 'msvc-compiler-info'Brad King2012-08-311-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 16fa7b7 VS: Fix MSVC_IDE definition recently broken by refactoring
| * | | | VS: Fix MSVC_IDE definition recently broken by refactoringBrad King2012-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 485a940e (VS: Simplify MSVC version reporting, 2012-08-23) we accidentally flipped the 0/1 values of MSVC_IDE. Flip them back and teach the CheckCompilerRelatedVariables test to check the variable.
* | | | | Merge topic 'fix-Qt-casing'Brad King2012-08-304-17/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3252149 Fix casing of 'Qt' in docs, comments and user-visible strings.
| * | | | | Fix casing of 'Qt' in docs, comments and user-visible strings.Stephen Kelly2012-08-284-17/+17
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | QT (cue-tea) is Apple QuickTime. Qt (cute) is the C++ framework.
* | | | | Merge topic 'mingw-unix-generator'Brad King2012-08-301-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | be9afbf Find mingw's windres also when Unix Makefiles are used
| * | | | | Find mingw's windres also when Unix Makefiles are usedPeter Kümmel2012-08-271-0/+4
| |/ / / /
* | | | | Merge topic 'cmcldeps-icl'Brad King2012-08-301-7/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0af27f1 Ninja: also detect /showInclude prefix for icl
| * | | | | Ninja: also detect /showInclude prefix for iclPeter Kümmel2012-08-271-7/+4
| |/ / / /
* | | | | Merge topic 'qt4-windows8'Brad King2012-08-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | caa9151 Fix errors detecting Qt4 on Windows 8.
| * | | | | Fix errors detecting Qt4 on Windows 8.Clinton Stimpson2012-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Petr Baloun for the patch.
* | | | | | Merge topic 'msvc-compiler-info'Brad King2012-08-3010-344/+209
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32b7c72 Merge branch 'cmake-platform-info-version' into msvc-compiler-info f3ddfef Modernize MSVC compiler information files 485a940 VS: Simplify MSVC version reporting 32db033 VS: Remove support for "free" version 2003 tools
| * | | | | Merge branch 'cmake-platform-info-version' into msvc-compiler-infoBrad King2012-08-3018-85/+119
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Modules/CMakeTestCCompiler.cmake Modules/CMakeTestCXXCompiler.cmake Modules/Platform/Windows-cl.cmake
| * | | | | | Modernize MSVC compiler information filesBrad King2012-08-304-99/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the old-style "Windows-cl.cmake" and its helper "cl.cmake". Load the information through new-style "Platform/Windows-MSVC-<lang>.cmake" files. Factor information common to C and CXX into a helper file "Platform/Windows-MSVC.cmake" loaded from the per-language files.
| * | | | | | VS: Simplify MSVC version reportingBrad King2012-08-305-110/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach Windows-cl.cmake to use CMAKE_(C|CXX)_COMPILER_VERSION to set the "MSVC##" and MSVC_VERSION variables. It no longer needs the IDE generator to dictate the version or to detect the version by running the command-line tool for NMake and Ninja generators. Drop configuration of CMakeCPlatform.cmake and CMakeCXXPlatform.cmake from Windows-cl.cmake.in because all the results it saved are now cheap to compute every time.