summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'AutomocIncludedDotMocFileHandling'David Cole2011-12-071-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d11951 Merge branch 'master' into AutomocIncludedDotMocFileHandling 1eca18f automoc: add documentation for CMAKE_AUTOMOC_STRICT_MODE bc278ce automoc: fix line length 62e223e automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsing 40c5167 automoc: accept even more .moc files in non-strict mode c207f5d automoc: also accept other files when .moc is included in non-strict mode 9c0df72 automoc: add a StrictParseCppFile(), which is only qmake-compatible 174bf35 automoc: move the code for finding headers into separate function 8507eae automoc: fix handling of included _p.moc files 7ada172 automoc: some more linebreaks for the warnings for better readability 3b93e26 automoc: add extra check whether the header contains Q_PRIVATE_SLOT 4745715 Add a test case for the use of Q_PRIVATE_SLOT. bde4edb automoc: add special handling for including basename_p.moc, with test 74ab0f6 automoc: move some code from the big parsing loop into separate functions bc7560e automoc: add test for including a moc_abc_p.cpp file 30fd8e6 automoc: add test for including the moc file from another header ...
| * Merge branch 'master' into AutomocIncludedDotMocFileHandlingDavid Cole2011-12-0735-119/+364
| |\ | | | | | | | | | | | | Conflicts: Source/cmTarget.cxx
| * | automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsingAlex Neundorf2011-12-021-0/+1
| | | | | | | | | | | | Alex
* | | Merge topic 'topics/FindCUDA/Misc-fixes'David Cole2011-12-071-10/+11
|\ \ \ | | | | | | | | | | | | | | | | aa36082 Miscellaneous fixes.
| * | | Miscellaneous fixes.James Bigler2011-12-061-10/+11
| | | |
* | | | Merge topic 'topics/FindCUDA/Multi-dir-clash'David Cole2011-12-071-10/+54
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | 80e279d Make CUDA working directory unique for each target.
| * | | Make CUDA working directory unique for each target.James Bigler2011-12-061-10/+54
| |/ / | | | | | | | | | | | | This allows you to have more than source file with the same name but different directories. The intermediate and configuration files are now in this same directory.
* | | Merge topic 'topics/FindCUDA/Quote-fixes'David Cole2011-12-062-21/+21
|\ \ \ | | | | | | | | | | | | | | | | c3c7a0c Fixes for handling quotes in args and other places (Fix Bug 11726 and 12099).
| * | | Fixes for handling quotes in args and other places (Fix Bug 11726 and 12099).James Bigler2011-12-062-21/+21
| |/ /
* | | Merge topic 'topics/FindCUDA/FixCUDAInUNCPath'David Cole2011-12-061-2/+16
|\ \ \ | | | | | | | | | | | | | | | | 83d4eea Add work around for CUDA in UNC paths.
| * | | Add work around for CUDA in UNC paths.James Bigler2011-12-051-2/+16
| |/ / | | | | | | | | | | | | | | | Nvcc can emit '/path' instead of '//path' which can cause a lot of grief later. We test to see if the file exists, if it doesn't then we see if the file exists with '/' prepended. Files that don't exist won't be added to the list.
* | | Merge topic 'topics/FindCUDA/linux-double-build'David Cole2011-12-061-0/+2
|\ \ \ | | | | | | | | | | | | | | | | aa59544 Reset dependency file list when a dependency disappeared.
| * | | Reset dependency file list when a dependency disappeared.James Bigler2011-12-051-0/+2
| |/ / | | | | | | | | | | | | | | | Fix a long outstanding bug when a file in the dependency list wasn't found. This bug wouldn't reset the dependencies, so the makefile would still want the missing file when building. The work around was to configure twice, but this is no longer necessary.
* | | Merge topic 'GNU-to-MS'David Cole2011-12-0615-0/+116
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae62a1c Test CMAKE_GNUtoMS option in ExportImport on MinGW and MSys afb00fe Add CMAKE_GNUtoMS option to convert GNU .dll.a to MS .lib 61e8629 Factor makefile generator link rule lookup into helper function a603250 Load platform files that need to know the ABI when possible ecd8414 Fortran: Detect pointer size in gfortran on MinGW
| * | | Add CMAKE_GNUtoMS option to convert GNU .dll.a to MS .libBrad King2011-12-056-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the Windows-GNU.cmake platform file to look for Visual Studio tools matching the target ABI. Add an extra step to the link command for shared libraries and executables that export symbols and on which a new GNUtoMS property is set (initialized by the CMAKE_GNUtoMS option). Tell the GNU linker to output a module definition (.def) file listing exported symbols in addition to the GNU-format import library (.dll.a). Pass the .def file to the MS "lib" tool to construct a MS-format DLL import library (.lib). Teach the install(TARGETS) command to install the MS import library next to the GNU one. Teach the install(EXPORT) and export() command to set the IMPORTED_IMPLIB property pointing at the import library to use the import library matching the tools in the importing project.
| * | | Load platform files that need to know the ABI when possibleBrad King2011-12-056-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load platform files named in CMAKE_<lang>_ABI_FILES for each language once the ABI sizeof(void*) is known. During the first configuration this is after the test for working compiler and ABI detection checks. During later configurations the ABI information is immediately available because it has been saved in CMake<lang>Compiler.cmake.
| * | | Fortran: Detect pointer size in gfortran on MinGWBrad King2011-12-053-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Use __SIZEOF_POINTER__ which the GNU Fortran compiler defines at least on 64-bit MinGW. Assume default size 4 on MinGW if gfortran does not define the size.
* | | | Merge topic 'CUDAv3.2PathChanges'David Cole2011-12-061-11/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 8930938 Added support for CUDA_PATH which is present in the CUDA toolkit 3.2 onward.
| * | | | Added support for CUDA_PATH which is present in the CUDA toolkit 3.2 onward.James Bigler2011-12-051-11/+14
| | |/ / | |/| | | | | | | | | | | | | | This required changing how the paths were used. I now use the PATH_SUFFIXES parameter instead of putting the whole path in the command.
* | | | Merge topic 'findlapack-0012477-new'David Cole2011-12-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f44f053 FindLAPACK: Fix linking to static LAPACK on Unix (#12477)
| * | | | FindLAPACK: Fix linking to static LAPACK on Unix (#12477)Alexey Ozeritsky2011-12-051-1/+1
| | | | |
* | | | | Merge topic 'TinyCC-compiler'David Cole2011-12-063-0/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0efe602 TinyCC: Add default compilation flags (#12605) ec636e2 TinyCC: Add compiler info for shared libs on Linux (#12605) 1f49d72 Recognize the Tiny C Compiler (#12605)
| * | | | | TinyCC: Add default compilation flags (#12605)Mathieu Malaterre2011-12-051-0/+7
| | | | | |
| * | | | | TinyCC: Add compiler info for shared libs on Linux (#12605)Brad King2011-12-022-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the "-shared" option to link shared libraries. The compiler does not support "-Wl," or "-rpath" but does know how to pass "-soname" through to the linker.
| * | | | | Recognize the Tiny C Compiler (#12605)Brad King2011-12-021-0/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See compiler home page here: http://tinycc.org/ http://bellard.org/tcc/ Use the id "TinyCC" as it appears in their online documentation.
* | | | | Fix path quoting in Qt4 macrosPierre-Francois Laquerre2011-12-041-9/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding VERBATIM to the ADD_CUSTOM_COMMAND calls in the qt4 macros ensures that paths are properly quoted when passed to the shell. This fixes issues when building projects that contained paths with special characters (according to /bin/sh), such as parentheses or spaces.
* | | | Merge topic 'FindZLIB-use-ZLIB_ROOT'David Cole2011-12-011-10/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 985dee4 FindZLIB: Search under ZLIB_ROOT if it is set
| * | | | FindZLIB: Search under ZLIB_ROOT if it is setBrad King2011-11-301-10/+25
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform multiple separate searches in order. If ZLIB_ROOT is set search it exclusively so it takes precedence over CMAKE_PREFIX_PATH. This allows a user to provide -DZLIB_ROOT=/path/to/zlib/prefix on the CMake command line to tell it exactly where to find zlib. Otherwise fall back to a normal search. Inspired-by: Andreas Schneider <asn@cryptomilk.org>
* | | | Merge topic 'useqt4-fix-declarative'David Cole2011-12-011-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3cd08ce Qt4: Fix dependencies of QtDeclartive.
| * | | | Qt4: Fix dependencies of QtDeclartive.Clinton Stimpson2011-11-291-3/+3
| |/ / /
* | | | Merge topic 'automoc_qt5'David Cole2011-12-011-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | a828623 moc is now part of the Qt5Core module b8c8cab Merge remote-tracking branch 'origin/master' into automoc_qt5
| * | | moc is now part of the Qt5Core moduleStephen Kelly2011-11-261-1/+1
| | | | | | | | | | | | | | | | There is no separate SrcTools module anymore.
| * | | Merge remote-tracking branch 'origin/master' into automoc_qt5Stephen Kelly2011-11-104-19/+89
| |\ \ \
* | \ \ \ Merge topic 'EclipseImprovedSourceProject'David Cole2011-11-221-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 982b766 Eclipse: use new variable CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT 1110e45 Eclipse: create links to subprojects also in the source-project (#12579)
| * | | | | Eclipse: use new variable CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECTAlex Neundorf2011-11-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously ECLIPSE_CDT4_GENERATE_SOURCE_PROJECT was used, but the new name CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT is more in line with the general naming conventions in cmake, and, more importantly IMO, in cmake-gui it now appears right next to the other eclipse-related variables, which all start with CMAKE_ECLIPSE_. A warning is printed if the old variable is TRUE and the new one isn't, so users should notice that they have to enable the new one. Alex
* | | | | | Merge topic 'FindPNG_Provide_PNG_INCLUDE_DIRS_Variable'David Cole2011-11-221-6/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | df0f302 FindPNG: provide PNG_INCLUDE_DIRS, as the readme.txt says (#11312)
| * | | | | | FindPNG: provide PNG_INCLUDE_DIRS, as the readme.txt says (#11312)Alex Neundorf2011-11-181-6/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also improve the documentation a bit. Alex
* | | | | | Merge topic 'FindBISON-version-regex'David Cole2011-11-221-2/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20cb5ed FindBISON: Fix matching output of "bison --version" f30f9a5 FindBISON: Fix bison++ version parsing to avoid "Offending entry"
| * | | | | | FindBISON: Fix matching output of "bison --version"Rolf Eike Beer2011-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output may contain semicolons, which will confuse the IF() because of missing quoting.
| * | | | | | FindBISON: Fix bison++ version parsing to avoid "Offending entry"Ondrej Balaz2011-11-111-2/+11
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've just found out that use of FindBISON.cmake shipped with CMake 2.8 on system where bison++ is default bison executable (e.g. Debian Linux) will result in corrupted CMakeCache.txt file and parse error due to "Offending entry" As FindBISON.cmake logic used to obtain installed bison executable version is tailored to match only the message used in GNU Bison it fails on absolutely different Bison++ version message and whole version message including \n characters is stored into BISON_VERSION which is then dumped into CMakeCache.txt, so everything after first \n character makes "Offending entry".
* | | | | | Merge topic 'FixGettextPoProcessingWithMultipleDots'David Cole2011-11-221-6/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65dde30 FindGettext: two more fixes for files with multiple dots e48fcff -make GETTEXT_PROCESS_PO_FILES() work with files with multiple dots ecb4459 Strip trailing whitespace
| * | | | | FindGettext: two more fixes for files with multiple dotsAlex Neundorf2011-11-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Another patch by Albert Astals Cid for dealing with translation files with multiple dots. Alex
| * | | | | -make GETTEXT_PROCESS_PO_FILES() work with files with multiple dotsAlex Neundorf2011-11-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by Albert Astals Cid. E.g. plasma_package_org.kde.activityswitcher.po will now be installed correctly as plasma_package_org.kde.activityswitcher.mo, and not as plasma_package_org.mo. This is kind-of related to #12282 Alex
| * | | | | Strip trailing whitespaceAlex Neundorf2011-11-151-3/+3
| |/ / / / | | | | | | | | | | | | | | | Alex
* | | | | Merge topic 'qt4-deploy-module'David Cole2011-11-151-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b688f11 Check QtCore without warning.
| * | | | | Check QtCore without warning.Mike McQuaid2011-11-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When debug and release versions of QtCore were available it printed a warning. This has been fixed.
* | | | | | Merge topic 'FindBoost-vs11-issue-12568'David Cole2011-11-151-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c4ba48 FindBoost: Use MSVC11 to find Boost on Windows (#12568)
| * | | | | | FindBoost: Use MSVC11 to find Boost on Windows (#12568)Mateusz Loskot2011-11-101-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it, add recent Boost versions.
* | | | | | | Merge topic 'automoc_qt5'David Cole2011-11-151-0/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bafe5cc Fix style. 74b9392 Update comments and method names to not be Qt4 specific. 812dab0 Don't assume the existence of QT_MAJOR_VERSION.
| * | | | | | Don't assume the existence of QT_MAJOR_VERSION.Stephen Kelly2011-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also handle Qt5SrcTools_MAJOR_VERSION.
generated by cgit v0.12 at 2025-01-04 10:40:59 (GMT)