summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'topics/FindCUDA/Add-CUDA_SOURCE_PROPERTY_FORMAT'David Cole2012-08-241-19/+29
|\ | | | | | | | | 787287c Added CUDA_SOURCE_PROPERTY_FORMAT. Allows setting per file format (OBJ or PTX)
| * Added CUDA_SOURCE_PROPERTY_FORMAT. Allows setting per file format (OBJ or PTX)James Bigler2012-08-201-19/+29
| | | | | | | | | | Added CUDA_SOURCE_PROPERTY_FORMAT that allows users to set the format (OBJ or PTX) on a per file basis.
* | Merge topic 'topics/FindCUDA/Fix-g3-again'David Cole2012-08-241-1/+11
|\ \ | | | | | | | | | | | | a20c41d Replace -g3 with -g for CUDA 4.1 and 4.2 in addition to CUDA < 3.0.
| * | Replace -g3 with -g for CUDA 4.1 and 4.2 in addition to CUDA < 3.0.James Bigler2012-06-191-1/+11
| | | | | | | | | | | | | | | CUDA 4.1 reintroduced the bug where -g3 breaks compilation. This wasn't fixed until CUDA 5.0, so both CUDA 4.1 and 4.2 have this bug.
* | | Merge topic 'Qt4Macros-fix-resource-parsing'Brad King2012-08-231-3/+5
|\ \ \ | |_|/ |/| | | | | | | | 3553001 Qt4Macros: Fix recently broken resource file parsing
| * | Qt4Macros: Fix recently broken resource file parsingBrad King2012-08-221-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 4be67837 (read less from version headers into variables, 2012-08-19) switched from file(READ) and string(REGEX MATCHALL) to just file(STRINGS) to extract the list of resource <file> entries. However, the latter extracts entire lines that match the regex, not just the part that matches the regex, so the subsequent string(REGEX REPLACE) fails to match and replace anything. Return to the original parsing logic but replace file(READ) with file(STRINGS) to load a minimal part of the file before using string(REGEX MATCHALL) as before.
* | | Merge topic 'qt4_use_modules'David Cole2012-08-202-0/+32
|\ \ \ | | | | | | | | | | | | | | | | 1420691 Add new qt4_use_modules function.
| * | | Add new qt4_use_modules function.Stephen Kelly2012-08-192-0/+32
| | | |
* | | | Merge topic 'read-less-from-version-headers'David Cole2012-08-209-30/+35
|\ \ \ \ | | |/ / | |/| | | | | | | | | | 4be6783 read less from version headers into variables
| * | | read less from version headers into variablesRolf Eike Beer2012-08-199-30/+35
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Instead of reading the whole file using file(READ) and later matching on the whole file use file(STRINGS ... REGEX) to get only those lines we are interested in at all. This will make the list much smaller (good for debugging) and also the regular expressions will need to match on much smaller strings. Also unset the content variables once they are not used anymore.
* | | Merge topic 'no-regex-escape-space'David Cole2012-08-202-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 637207e do not escape spaces in regular expressions
| * | | do not escape spaces in regular expressionsRolf Eike Beer2012-08-192-2/+2
| |/ / | | | | | | | | | | | | The space has no special meaning in regular expressions so it doesn't need to be escaped.
* | | Merge topic 'FindGTK2_12306'David Cole2012-08-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | ad30210 FindGTK2: Add GTK2_CAIROMMCONFIG_INCLUDE_DIR for cairommconfig.h
| * | | FindGTK2: Add GTK2_CAIROMMCONFIG_INCLUDE_DIR for cairommconfig.hPhilip Lowman2012-08-181-0/+1
| |/ /
* | | Merge topic 'FindOpenSceneGraph_13094'David Cole2012-08-203-4/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | dd60ed2 Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094 224b5de FindOpenSceneGraph: CMake variable OSG_DIR influences detection now too
| * \ \ Merge topic 'lib64-cleanup' into FindOpenSceneGraph_13094Philip Lowman2012-08-1830-391/+342
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved a few conflicts due to changes made in 13094 to paths Conflicts: Modules/FindOpenThreads.cmake Modules/Findosg_functions.cmake
| * | | | FindOpenSceneGraph: CMake variable OSG_DIR influences detection now tooPhilip Lowman2012-08-183-4/+25
| | |/ / | |/| |
* | | | Merge topic 'lib64-cleanup'David Cole2012-08-2030-391/+342
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | cfe4ac4 use PATH_SUFFIXES to simplify find_* calls b04650e use the find_* functions ENV parameter
| * | | use PATH_SUFFIXES to simplify find_* callsRolf Eike Beer2012-08-1419-242/+195
| | | | | | | | | | | | | | | | | | | | | | | | Especially remove "lib64" when the given paths are all Unix ones and "lib" is also explicitely given. In that case CMake will search "lib64" anyway for platforms where it is known to make sense.
| * | | use the find_* functions ENV parameterRolf Eike Beer2012-08-1428-151/+149
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Instead of directly passing $ENV{SOMEVAR} to a find_* call pass in ENV SOMEVAR. This will make sure the paths will get correctly handled through different platforms, especially on Windows. Also fixes one place where paths with windows delimiters (\) were hardcoded to use forward slashes.
* | | Merge topic 'fix-13236-mark-vars-as-advanced'David Cole2012-08-201-0/+7
|\ \ \ | | | | | | | | | | | | | | | | 3f9fa5c ProcessorCount: Mark find_program vars as advanced (#13236)
| * | | ProcessorCount: Mark find_program vars as advanced (#13236)David Cole2012-08-171-0/+7
| |/ / | | | | | | | | | | | | After each find_program call, mark_as_advanced each find result variable to avoid polluting the cache with non-advanced variables
* | | Merge topic 'fix-13315-incorrect-mfc-file-name'David Cole2012-08-201-2/+3
|\ \ \ | | | | | | | | | | | | | | | | e4e6ea0 InstallRequiredSystemLibraries: Use correct file names (#13315)
| * | | InstallRequiredSystemLibraries: Use correct file names (#13315)David Cole2012-08-171-2/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Spanish language MFC localization dll changed names from VS 9 to 10. Use the correct file name ending with "esn.dll" instead of the now non-existent one ending with "esp.dll" Also, add the existing, but missing from our rules until now, Russian language module. Alphabetize the list while we're at it for easier reading in the future. We may want to consider adding some file(GLOB code here to minimize the risk of missing files added in future versions of VS.
* | | Merge topic 'HandleMacFrameworkIncludeDirs_13465'David Cole2012-08-201-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a3815e6 -fix line length 9110d0e Eclipse on OSX: improve handling of framework include dirs (#13367) d97b385 Eclipse on OSX: fix handling of framework include dirs (#13464)
| * | | Eclipse on OSX: fix handling of framework include dirs (#13464)Alex Neundorf2012-08-161-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On OSX, the output from gcc looks like this: /usr/include/c++/4.2.1 /usr/include/c++/4.2.1/i686-apple-darwin10/x86_64 /usr/include/c++/4.2.1/backward /usr/lib/gcc/i686-apple-darwin10/4.2.1/include /usr/include /System/Library/Frameworks (framework directory) /Library/Frameworks (framework directory) End of search list. The "(framework directory)" part needs to be removed so that Eclipse handles it properly Alex
* | | Merge topic 'qt4-path-search'David Cole2012-08-201-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | 35c6ae8 FindQt4: Give precedence to QTDIR environment variable, if set. 5a6a3d4 FindQt4: Give precedence to QTDIR environment variable, if set.
| * | | FindQt4: Give precedence to QTDIR environment variable, if set.Clinton Stimpson2012-08-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove old search paths that aren't needed. Keep using PATHS instead of HINTS because a Windows machine may have a different Qt in its PATH and putting QTDIR and the registry entry ahead of PATH could cause apps to fail when run.
| * | | FindQt4: Give precedence to QTDIR environment variable, if set.Clinton Stimpson2012-08-161-1/+1
| | | |
* | | | Merge topic 'qt4-version-regex'David Cole2012-08-201-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | 4a772a1 Fix regex for qt minor version.
| * | | Fix regex for qt minor version.Clinton Stimpson2012-08-161-1/+1
| |/ / | | | | | | | | | Thanks to Dubrovskiy Viacheslav and Sergei Epifanov for patch.
* | | Merge topic 'hg-modules'David Cole2012-08-202-1/+175
|\ \ \ | | | | | | | | | | | | | | | | | | | | 91053cd ExternalProject: Add Mercurial (hg) repository support ea5bfb1 Add FindHg module to find Mercurial
| * | | ExternalProject: Add Mercurial (hg) repository supportBrad King2012-08-161-1/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add options HG_REPOSITORY and HG_TAG to specify an external project hosted in a Mercurial repository. Teach ExternalProject to clone the repository and update from it. Extend the ExternalProject test to try a Mercurial repository when hg is available.
| * | | Add FindHg module to find MercurialBrad King2012-08-141-0/+48
| |/ / | | | | | | | | | Also teach the CMakeOnly.AllFindModules to verify Hg version detection.
* | | Merge topic 'relwithdebinfo-consistency'David Cole2012-08-2010-10/+10
|\ \ \ | | | | | | | | | | | | | | | | 0ddfc51 Add -DNDEBUG to RelWithDebInfo flags where where Release flags had it.
| * | | Add -DNDEBUG to RelWithDebInfo flags where where Release flags had it.Clinton Stimpson2012-08-1610-10/+10
| |/ / | | | | | | | | | | | | | | | Previously, it was inconsistent in that some platforms/compilers had this flag for the RelWithDebInfo configuration and some didn't. This fixes issue #11366.
* | | Merge topic 'deployqt4-destdir'David Cole2012-08-201-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 1e3248c DeployQt4: Include DESTDIR for some cpack generators.
| * | | DeployQt4: Include DESTDIR for some cpack generators.Clinton Stimpson2012-08-161-2/+2
| |/ /
* | | Merge topic 'fphsa-message'David Cole2012-08-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 213a9e5 fphsa: clarify message about minimum required version found.
| * | | fphsa: clarify message about minimum required version found.Clinton Stimpson2012-08-161-1/+1
| |/ / | | | | | | | | | Thanks to Dubrovskiy Viacheslav.
* | | Merge topic 'more-endif-closing-style-cleanups'David Cole2012-08-204-17/+5
|\ \ \ | | | | | | | | | | | | | | | | 84b49be Remove CMake multiline block-end command arguments
| * | | Remove CMake multiline block-end command argumentsMarcin Wojdyr2012-08-154-17/+5
| |/ / | | | | | | | | | removing arguments omitted in 9db3116226cb99fcf54e936c833953abcde9b729
* | | Merge topic 'FindX11-duplicate-includes-13316'David Cole2012-08-201-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | dd784dd FindX11: avoid calling list(REMOVE_DUPLICATES) on an empty list 97c338b FindX11: remove duplicates from X11 include path list (#13316)
| * | | FindX11: avoid calling list(REMOVE_DUPLICATES) on an empty listRolf Eike Beer2012-08-151-1/+3
| | | |
| * | | FindX11: remove duplicates from X11 include path list (#13316)Rolf Eike Beer2012-08-141-0/+3
| |/ / | | | | | | | | | | | | Most if not all X11 includes are typically in the same directory, so this usually returns a huge list with only very few different entries.
* | | Merge topic 'clang-asm'David Cole2012-08-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 7e8471c Recognize Clang ASM support (#13473)
| * | | Recognize Clang ASM support (#13473)Brad King2012-08-151-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Since commit 571dc748 (Recognize Clang C and C++ compilers, 2010-05-17) we recognize Clang C and C++ support. Add Compiler/Clang-ASM.cmake to enable use of Clang for ASM too. Also teach Assembler test to try Clang as an assembler. Suggested-by: Tobias Pape <tobiaspape@gmail.com>
* | | Merge topic 'CheckTypeSize-doc-10579'David Cole2012-08-201-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | c6fed68 CheckTypeSize: add a test for size of struct members 48783b7 CheckTypeSize: show in documentation how to get struct member size (#10579)
| * | | CheckTypeSize: show in documentation how to get struct member size (#10579)Rolf Eike Beer2012-08-141-0/+5
| |/ /
* | | GetPrerequisites: Mark file_cmd as advanced cache entryBrad King2012-08-141-0/+1
|/ / | | | | | | | | This internal implementation detail should not pollute the main cache view of projects that include GetPrerequisites.
generated by cgit v0.12 at 2025-02-01 15:26:39 (GMT)