summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-target-pdb-cleanup'David Cole2012-08-243-47/+42
|\ | | | | | | | | | | | | 709fa59 Ninja: remove GetTargetPDB because it is used only once 4bb4787 Ninja:split out setting of msvc TARGET_PDB 59cbc28 Ninja: prepare msvc pdb cleanup
| * Ninja: remove GetTargetPDB because it is used only oncePeter Kümmel2012-08-222-17/+11
| |
| * Ninja:split out setting of msvc TARGET_PDBPeter Kümmel2012-08-223-25/+24
| |
| * Ninja: prepare msvc pdb cleanupPeter Kümmel2012-08-222-17/+19
| |
* | Merge topic 'compile-definitions-unique'David Cole2012-08-2411-91/+215
|\ \ | | | | | | | | | | | | | | | | | | | | | f0a1065 Rename files from main.cpp to more meaningful names. ca7fb14 Fix the test setting COMPILE_DEFINITIONS target property 733deb6 Fix CompileDefinitions test on Visual Studio. 3dae652 Don't duplicate -D defines sent to the compiler.
| * | Rename files from main.cpp to more meaningful names.Stephen Kelly2012-08-225-5/+5
| | | | | | | | | | | | | | | | | | Because the main file for the dummy-executable and the actual compile test were both called main.cpp, they were overwriting each other during in-source builds.
| * | Fix the test setting COMPILE_DEFINITIONS target propertyStephen Kelly2012-08-211-1/+1
| | |
| * | Fix CompileDefinitions test on Visual Studio.Stephen Kelly2012-08-212-1/+10
| | | | | | | | | | | | Avoid testing unsupported spaces in define values.
| * | Don't duplicate -D defines sent to the compiler.Stephen Kelly2012-08-2011-91/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to do so. Be consistent with include directories and ensure uniqueness. This requires changing the API of the cmLocalGenerator::AppendDefines method, and changing the generators to match. The test unfortunately can't test for uniqueness, but it at least verifies that nothing gets lost.
* | | 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 'pic-docs'David Cole2012-08-242-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c82fbe0 Fix unfortunate documentation error for PIC feature.
| * | | | Fix unfortunate documentation error for PIC feature.Stephen Kelly2012-08-202-2/+5
| | |/ / | |/| | | | | | | | | | | | | | The wrong variable is documented, and it is not referred to in the target-specific property.
* | | | Merge topic 'minor-docs-fixes'David Cole2012-08-243-7/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee949d8 Remove duplicate 'of' from docs. ecc1acb Remove incorrect doc string for link type enum 805f5e5 Fix some typos in the docs. 389d423 Add missing whitespace to docs.
| * | | | Remove duplicate 'of' from docs.Stephen Kelly2012-08-201-1/+1
| | | | |
| * | | | Remove incorrect doc string for link type enumStephen Kelly2012-08-191-3/+0
| | | | | | | | | | | | | | | | | | | | This is actually a duplicate doc string for a method a few lines above.
| * | | | Fix some typos in the docs.Stephen Kelly2012-08-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | s/static the static/the static/ Make Visual Studio capitalized.
| * | | | Add missing whitespace to docs.Stephen Kelly2012-08-191-1/+1
| |/ / /
* | | | Merge topic 'DependencyScanning_13474'David Cole2012-08-244-19/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8aed02a -fix Java dependency scanning, broken in previous commit 7ae4479 -fix line length 87fe428 fix #13474: also rescan dependencies if the depender does not exist
| * | | | -fix Java dependency scanning, broken in previous commitAlex Neundorf2012-08-202-2/+3
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | -fix line lengthAlex Neundorf2012-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | Alex
| * | | | fix #13474: also rescan dependencies if the depender does not existAlex Neundorf2012-08-172-17/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the depender (e.g. foo.o) does not exist, also rescan dependencies if one of the dependees (e.g. foo.cxx) is older than the already existing depend.internal file, since this means it can be out of date. Alex
* | | | | Merge topic 'test-ObjectLibrary-lang'David Cole2012-08-242-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 94c08b3 Tests/ObjectLibrary: Do not enable CXX in subdirectories
| * | | | | Tests/ObjectLibrary: Do not enable CXX in subdirectoriesBrad King2012-08-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b237dbd8 (Xcode: Fix object library references in multi-project trees, 2012-08-03) we accidentally enabled CXX in the subdiretories of this test by invoking project() with only one argument. The top-level directory of the test enables only C, so do this in the subdirectories too.
* | | | | | 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.
* | | | | | | CMake Nightly Date StampKitware Robot2012-08-241-1/+1
| | | | | | |
* | | | | | | 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.
* | | | | | | | CMake Nightly Date StampKitware Robot2012-08-231-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-08-221-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2012-08-211-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | 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-203-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 637207e do not escape spaces in regular expressions
| * | | | | do not escape spaces in regular expressionsRolf Eike Beer2012-08-193-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | 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 'cmcldeps-needs-cl'David Cole2012-08-201-18/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a35bd0 Ninja: don't crash on returned 0 pointer 3632f24 Ninja: cmcldeps needs a compiler
| * | | | | | | | Ninja: don't crash on returned 0 pointerPeter Kümmel2012-08-171-21/+18
| | | | | | | | |
generated by cgit v0.12 at 2025-09-09 22:20:04 (GMT)