summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmGlobalGenerator: Refactor global target constructionBrad King2016-09-152-120/+119
| | | | | | Avoid using partially-constructed cmTarget instances. Collect the information about how to construct each target in a separate structure and then actually create each cmTarget with full construction.
* cmGlobalGenerator: Split CreateDefaultGlobalTargets implementationBrad King2016-09-152-35/+57
| | | | | Divide this long method into multiple helpers each dedicated to one of the targets. This also avoids having to clear/re-use local structures.
* cmTarget: Inline SetType method at only remaining call siteBrad King2016-09-142-10/+6
|
* cmTarget: Construct with basic information up frontBrad King2016-09-145-32/+36
| | | | | Avoid having partially constructed cmTarget instances around, except for the special case of GLOBAL_TARGET construction.
* Avoid requiring default cmTarget constructor for map indexingBrad King2016-09-143-41/+65
| | | | | | The `std::map<>` index operator requires a default constructor on the value type. Avoid requiring a default constructor on `cmTarget` just for this purpose.
* cmTarget: Add method to get a copy adapted for a directoryBrad King2016-09-142-0/+12
| | | | | The "global" targets are built once for the top directory and then copied into all directories. Add a helper method to make the copy.
* Merge topic 'minor-cleanup'Brad King2016-09-141-3/+3
|\ | | | | | | | | 6a9ed3d4 cmGeneratorTarget: factor out a space
| * cmGeneratorTarget: factor out a spaceBen Boeckel2016-09-131-3/+3
| |
* | Merge topic 'cmake-E-help-order'Brad King2016-09-141-1/+1
|\ \ | | | | | | | | | | | | e952f1bd cmcmd: Fix sort order in help output
| * | cmcmd: Fix sort order in help outputTobias Hunger2016-09-131-1/+1
| | | | | | | | | | | | sort "sleep" before "tar", not after
* | | Merge topic 'file-curl-userpw'Brad King2016-09-1410-0/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | abeb42f1 Help: Add notes for topic 'file-curl-userpw' e5ba1041 file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboption
| * | | Help: Add notes for topic 'file-curl-userpw'Brad King2016-09-141-0/+5
| | | |
| * | | file(DOWNLOAD|UPLOAD): Add 'USERPWD' suboptionRuslan Baratov2016-09-139-0/+43
| | | |
* | | | Merge topic 'add_androidmk_generator'Brad King2016-09-1428-116/+1083
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42ce9f1e Add support for creating prebuilt Android.mk files d5257063 Export: Virtualize file generation step helpers f81b9475 Export: Factor out file generation steps into helpers
| * | | | Add support for creating prebuilt Android.mk filesBill Hoffman2016-09-1324-9/+941
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add options to the `install()` and `export()` commands to export the targets we build into Android.mk files that reference them as prebuilt libraries with associated usage requirements (compile definitions, include directories, link libraries). This will allow CMake-built projects to be imported into projects using the Android NDK build system. Closes: #15562
| * | | | Export: Virtualize file generation step helpersBill Hoffman2016-09-082-25/+26
| | | | | | | | | | | | | | | | | | | | Allow subclasses to override the actual content generation.
| * | | | Export: Factor out file generation steps into helpersBill Hoffman2016-09-084-87/+121
| | | | | | | | | | | | | | | | | | | | | | | | | Do not actually generate any content in the driving code paths. Use helpers for that.
* | | | | Merge topic 'ctest-subdir-spaces'Brad King2016-09-141-8/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f8613e9 Fix CTest test file generation for spaces in subdirectory names 385e6a27 cmLocalGenerator: Refactor test subdirectory generation loop
| * | | | | Fix CTest test file generation for spaces in subdirectory namesStefano Soffia2016-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode the subdirectory names properly for CMake syntax. Closes: #16299
| * | | | | cmLocalGenerator: Refactor test subdirectory generation loopStefano Soffia2016-09-131-8/+6
| | |/ / / | |/| | |
* | | | | Merge topic 'cmake-gui-open-project'Brad King2016-09-144-0/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1ca2d5d1 cmake-gui: Add button to open the generated project
| * | | | | cmake-gui: Add button to open the generated projectNico Heßler2016-09-134-0/+51
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Look for VS or Xcode project files at the top of the build tree. If present, enable an "Open Project" button to open them through the OS desktop services.
* | | | | CMake Nightly Date StampKitware Robot2016-09-141-1/+1
|/ / / /
* | | | Merge topic 'cmake-server-prepare'Brad King2016-09-133-22/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e58b9af cmake: Factor out method to find the CMakeCache.txt file c73967cb cmake: Introduce ReportCapabilitiesJson 366e3828 Update .gitignore
| * | | | cmake: Factor out method to find the CMakeCache.txt fileTobias Hunger2016-09-122-17/+26
| | | | |
| * | | | cmake: Introduce ReportCapabilitiesJsonTobias Hunger2016-09-122-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce cmake::ReportCapabilitiesJson which returns a the Json object that is serialized in cmake::ReportCapabilities. This allows to re-use the information in cmake-server.
| * | | | Update .gitignoreTobias Hunger2016-09-121-0/+5
| | |/ / | |/| | | | | | | | | | Ignore *.user* files from QtCreator and *.pyc files.
* | | | Merge topic 'timestamp-names'Brad King2016-09-135-0/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 410add40 Help: Add notes for topic 'timestamp-names' 751f7b52 string(TIMESTAMP ...): add '%a' and '%b' format specifiers
| * | | | Help: Add notes for topic 'timestamp-names'Brad King2016-09-121-0/+6
| | | | |
| * | | | string(TIMESTAMP ...): add '%a' and '%b' format specifiersRuslan Baratov2016-09-124-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | %b: Abbreviated month name (e.g. Oct). %a: Abbreviated weekday name (e.g. Fri).
* | | | | Merge topic 'fix-ctest-segfault'Brad King2016-09-132-9/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b35311ca CTestSVN: Fix segfault when CTEST_UPDATE_VERSION_ONLY is enabled
| * | | | | CTestSVN: Fix segfault when CTEST_UPDATE_VERSION_ONLY is enabledNils Gladitz2016-09-122-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the change the list of externals was queried only before the svn update. With the change the list is queried both before and after. This should also be more accurate since the list of externals might change during the update.
* | | | | | Merge topic 'doc-separate_arguments-formatting'Brad King2016-09-131-5/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4f349a86 Help: Fix formatting in separate_arguments documentation
| * | | | | | Help: Fix formatting in separate_arguments documentationJames Touton2016-09-121-5/+7
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make backslashes visible in the text. Rename VARIABLE to <var> in second signature for consistency with the first signature. Add link to referenced MSDN documentation.
* | | | | | Merge topic 'link-generated-rpaths-first'Brad King2016-09-131-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9370b697 Re-order link line to place RPATH entries before libraries
| * | | | | | Re-order link line to place RPATH entries before librariesDan Kegel2016-09-121-3/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we support adding arbitrary flags to the link line via `target_link_libraries` the project/user may add their own RPATH flags (typically for system library locations). Re-order the link line to place our generated RPATH entries before the libraries so that they also come before flag-specified entries. Otherwise our in-build-tree RPATH entries may not be preferred by the dynamic loader and we could collide with libraries in the system directories. Closes: #16293
* | | | | | Merge topic 'file-download-unexpected-arg'Brad King2016-09-1310-0/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4dd997da file(DOWNLOAD|UPLOAD): Warn on unexpected arguments
| * | | | | | file(DOWNLOAD|UPLOAD): Warn on unexpected argumentsRuslan Baratov2016-09-0910-0/+32
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Emit warning message on unparsed argument instead of silently ignoring it. Can't stop with the error message because it may break old code.
* | | | | | CMake Nightly Date StampKitware Robot2016-09-131-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'geh-failure-tests'Brad King2016-09-1212-203/+445
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 612d6f29 Tests: Refactor GenerateExportHeader test code ce76abb4 Tests: Add data symbols to GenerateExportHeader test 8f95b93b Tests: Add failure test for GenerateExportHeader
| * | | | Tests: Refactor GenerateExportHeader test codeMatthew Woehlke2016-09-127-237/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the library code used in the GenerateExportHeader test to use an improved naming convention that more directly identifies what it being tested, making use of namespaces to avoid possible symbol collisions. This also eliminates duplicate cases such as `libshared()` and `libshared_not_exported()` which had the same decoration, and adds consistent pairings of <name>_EXPORT and <name>_DEPRECATED_EXPORT which were missing previously. The data tests from the previous commit are also added to `libstatic` and `libshared_and_static` for consistency. Note that there are no exported members of exported classes, as these are not allowed on Windows.
| * | | | Tests: Add data symbols to GenerateExportHeader testMatthew Woehlke2016-09-123-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add static data members and global variables to the GenerateExportHeader shared library, testing that export decoration for these works in addition to decoration of classes and free functions.
| * | | | Tests: Add failure test for GenerateExportHeaderMatthew Woehlke2016-09-126-18/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify notation of statements in the GenerateExportHeader test expected to result in link errors. Modify script used to build the test to also generate a suite of modified sources, each having exactly one of the failing lines enabled, and to generate EXCLUDE_FROM_ALL executables for the same. Modify RunCMake script used to drive the test to read the list of such executables and try to build each of them, verifying that they do in fact fail to build. This will verify that the _NO_EXPORT macros are working as expected, and will also catch errors like the one that commit 0cbaaf2d (GenerateExportHeader: Fix add_compiler_export_flags regression, 2016-09-01) fixed. When setting up the failure tests for GenerateExportHeader, check if the compiler actually hides non-exported stuff. If not, the failure tests won't fail, and will cause the overall test to fail. Since this typically is only the case for very old compilers, simply skipping them as opposed to trying to do something more fine grained seems reasonably safe.
* | | | | Merge topic 'clang-tidy'Brad King2016-09-123-28/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73128b82 cmDependsFortran: simplify boolean expression 8f324c7c cmSystemTools: simplify boolean expressions 5d3b5bef QCMakeCacheView: simplify boolean expression ad42eb33 QCMakeCacheView: no else after return
| * | | | | cmDependsFortran: simplify boolean expressionDaniel Pfeifer2016-09-121-6/+1
| | | | | |
| * | | | | cmSystemTools: simplify boolean expressionsDaniel Pfeifer2016-09-121-15/+5
| | | | | |
| * | | | | QCMakeCacheView: simplify boolean expressionDaniel Pfeifer2016-09-081-4/+1
| | | | | |
| * | | | | QCMakeCacheView: no else after returnDaniel Pfeifer2016-09-081-3/+5
| | |_|/ / | |/| | |
* | | | | Merge topic 'bzip2-imported-targets'Brad King2016-09-126-1/+92
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79eba4b7 Help: Add notes for topic 'bzip2-imported-targets' 069cac58 Tests: Add FindBZip2 unit tests e9ce0503 FindBZip2: Add imported target
| * | | | | Help: Add notes for topic 'bzip2-imported-targets'Brad King2016-09-091-0/+4
| | | | | |