summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2014-12-051-1/+1
|
* Merge topic 'cached-regex-clear-fixed'Brad King2014-12-045-43/+69
|\ | | | | | | | | | | ceecd790 cmMakefile: store the number of last matches in a CMake var 7878d061 test: add a test for clearing regex results
| * cmMakefile: store the number of last matches in a CMake varBen Boeckel2014-12-035-43/+69
| | | | | | | | | | | | | | | | | | With PushScope and PopScope, keeping track of another bit of data for each scope isn't easy. Instead, store it as another CMake variable so it gets implicitly tracked along with everything else. This works in a revert of commit 7d674b5f0b28a610333644d417c2e8cb796cc9e4.
* | Merge topic 'fix-add_library-check-for-shared'Brad King2014-12-041-3/+2
|\ \ | | | | | | | | | | | | bd360ee3 add_library: Fix target type check for non-shared-lib platforms
| * | add_library: Fix target type check for non-shared-lib platformsBrad King2014-12-031-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When checking target types for TARGET_SUPPORTS_SHARED_LIBS == false, enumerate exactly the library types not supported rather than trying to maintain a list of all the types that are supported. Otherwise add_library(SomeImportedLib UNKNOWN IMPORTED) warns on platforms that do not support shared libraries. Reported-by: Kelly Thompson <kgt@lanl.gov>
* | | Merge topic 'vs-hlsl-typo'Brad King2014-12-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 955fbf29 VS: Fix typo in VS_SHADER_MODEL lookup comment
| * | | VS: Fix typo in VS_SHADER_MODEL lookup commentBrad King2014-12-031-1/+1
| | | |
* | | | Merge topic 'vs-phone-store-deployment-location'Brad King2014-12-041-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 352f246f VS: Add source file property to specify Windows App deployment location
| * | | | VS: Add source file property to specify Windows App deployment locationGilles Khouzam2014-12-031-0/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a VS_DEPLOYMENT_LOCATION source file property to specify where to put files that are part of the package. For example: set_property(SOURCE ${ASSET_FILES} PROPERTY VS_DEPLOYMENT_LOCATION "assets") Without this, sources marked with VS_DEPLOYMENT_CONTENT cannot be located properly.
* | | | CMake Nightly Date StampKitware Robot2014-12-041-1/+1
| | | |
* | | | Merge topic 'file-LOCK-command'Brad King2014-12-0316-0/+1121
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93017828 Help: Add notes for topic 'file-LOCK-command' e6db4c5a file: Add LOCK subcommand to do file and directory locking 05d6531c cmSystemTools: Add StringToInt helper
| * | | | file: Add LOCK subcommand to do file and directory lockingRuslan Baratov2014-12-0314-0/+1110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide options to fail without blocking or to block up to a timeout. Provide options to specify the scope containing the lock so it can be released automatically at the end of a function, file, or process. Extend the RunCMake.file test with cases covering the file(LOCK) command usage and error cases.
| * | | | cmSystemTools: Add StringToInt helperRuslan Baratov2014-12-032-0/+11
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Convert a string to a signed integer and reject any extra input. Co-Author: Rolf Eike Beer <eike@sf-mail.de>
* | | | Merge topic 'fix-wince-unicode-entry-point'Brad King2014-12-031-2/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 681cda02 VS, WINCE: Fix entry point for Unicode builds
| * | | | VS, WINCE: Fix entry point for Unicode buildsPascal Bach2014-12-031-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When _UNICODE is defined VS uses wmain instead of main as the entry function. To make this correctly work on WindowsCE EntryPointSymbol needs to be set to mainWCRTStartup instead of mainACRTStartup for console applications and to wWinMainCRTStartup instead of WinMainCRTStartup for GUI applications. Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
* | | | | Merge topic 'xcode-target-search-perf'Brad King2014-12-032-8/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 48f78f5f Xcode: use a map to look up target pointers (#15201)
| * | | | | Xcode: use a map to look up target pointers (#15201)Ben Boeckel2014-12-022-8/+10
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Use an efficient internal lookup to associate cmTarget and cmXCodeObject instances.
* | | | | Merge topic 'vs-hlsl-settings'Brad King2014-12-031-1/+26
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | 2a224b4c VS: Add source file properties to set the hlsl shader entry point and model
| * | | | VS: Add source file properties to set the hlsl shader entry point and modelCedric Perthuis2014-12-031-1/+26
| | |/ / | |/| | | | | | | | | | | | | | | | | | Create properties VS_SHADER_ENTRYPOINT and VS_SHADER_MODEL. Without these many .hlsl source files may not be possible to use. Extend the VSWinStorePhone test project to cover them.
* | | | Merge topic 'add-continue-command'Brad King2014-12-037-0/+116
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0de867dd continue: Add a new CMake language command for loop continuation (#14013)
| * | | | continue: Add a new CMake language command for loop continuation (#14013)Gregor Jasny2014-12-017-0/+116
| | |/ / | |/| | | | | | | | | | | | | | Inspired-by: Doug Barbieri Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | CMake Nightly Date StampKitware Robot2014-12-031-1/+1
| |_|/ |/| |
* | | Merge topic 'link-no-empty-response-files'Brad King2014-12-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 1c5be1f3 Makefile: Do not create an empty linker response file
| * | | Makefile: Do not create an empty linker response fileBrad King2014-12-011-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~821^2 (Windows: Use response files to specify link libraries for GNU tools, 2014-03-04) we use a response file to pass possibly long linker flag lists to the GNU linker on Windows. On MinGW, this may cause gfortran to use a response file to pass some flags to its own internal invocation. This is okay except when we are parsing implicit link flags from the compiler ABI detection build. If gfortran uses a response file in that case then we may miss extracting some of the implicit link flags, such as -lgfortran. Fortunately, in the compiler ABI detection case we do not actually link to anything so the response file is empty. Work around this problem by simply not using a response file when the list of flags it is used to pass is empty (or just whitespace). Reported-by: Bill Somerville <bill@classdesign.com>
* | | CMake Nightly Date StampKitware Robot2014-12-021-1/+1
| |/ |/|
* | Merge topic 'target-sources-error-conditions'Brad King2014-12-013-3/+44
|\ \ | | | | | | | | | | | | | | | | | | 8a75c7ef Help: Document the export limitation of INTERFACE_SOURCES. e1348056 Export: Disallow export of targets with INTERFACE_SOURCES bb5905bb cmTarget: Don't allow relative paths in INTERFACE_SOURCES
| * | Export: Disallow export of targets with INTERFACE_SOURCESStephen Kelly2014-11-292-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be allowed in the next release, but it needs to have some features present and tested such as * Ensuring that relative paths do not appear in the generated property. * Ensuring that paths to the source or build directories do not appear. * Generating a check in the file for CMake 3.1 or later so that the resulting property will be consumed. * Ensuring that any referenced targets are part of an export set and generating a check for them. * INSTALL_INTERFACE and BUILD_INTERFACE content. All of these checks are already done for INTERFACE_INCLUDE_DIRECTORIES, but it is too late to add them for INTERFACE_SOURCES for CMake 3.1. As the checks introduce some new error conditions, it is better to disallow exporting fully for this case and introduce proper error conditions later instead of policies.
| * | cmTarget: Don't allow relative paths in INTERFACE_SOURCESStephen Kelly2014-11-291-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the pattern of checks that are made for INTERFACE_INCLUDE_DIRECTORIES. Existence is already checked by cmSourceFile::GetFullPath. Add a check to disallow relative paths in source directories. Otherwise code such as target_sources(lib1 INTERFACE foo.cpp) would fail if consumed by a target in a different directory. Unlike the INTERFACE_INCLUDE_DIRECTORIES behavior, we don't care whether the entry comes from an IMPORTED target or not. In the include directories case, the directory for a non-imported target might not exist yet but might be created. In the sources case, a file which does not yet exist in the filesystem must be explicitly marked with the GENERATED property. Adjust existing tests and add a new test for the error.
* | | Merge topic 'fix-transitive-OBJECT_SOURCES-context'Brad King2014-12-011-34/+40
|\ \ \ | | | | | | | | | | | | | | | | 672f1001 Genex: Fix evaluation context propagation for TARGET_OBJECTS.
| * | | Genex: Fix evaluation context propagation for TARGET_OBJECTS.Stephen Kelly2014-11-261-34/+40
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract a new method to encapsulate the requirements of evaluating dependent-expressions, namely, propagation of the EvaluateForBuildsystem setting, which is missing from the getLinkedTargetsContent implementation. Commit v3.1.0-rc1~688^2 (Genex: Only evaluate TARGET_OBJECTS to determine target sources., 2014-03-20) introduced an error case for use of TARGET_OBJECTS outside of the context of generating the buildsystem, as the path to object files may be dependent on buildsystem variables (See bug #15226). Commit v3.1.0-rc1~314^2 (Allow INTERFACE_SOURCES to specify $<TARGET_OBJECTS> (#14970), 2014-07-09) made it possible to propagate such content to dependent targets. While that commit propagated the EvaluateForBuildsystem setting for the case of a TARGET_PROPERTY expression, as generated for direct dependencies of a target in cmTargetInternals::AddInterfaceEntries, it did not add propagation for content from further transitive target dependencies, as determined by getLinkedTargetsContent.
* | | Merge topic 'fix-source-case-matching'Brad King2014-12-011-1/+2
|\ \ \ | | | | | | | | | | | | | | | | 84d124e8 Fix lookup of source names after conversion to their actual case (#15259)
| * | | Fix lookup of source names after conversion to their actual case (#15259)Brad King2014-11-261-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~688^2~15 (cmTarget: Add a method to obtain list of filenames for sources, 2014-03-17) we have code paths that lookup sources by strings containing their own full path after normalization to the actual case on disk. This fails in the case that a cmSourceFile has already been created with a different case in the filename. The comparison of the directory works because it is always normalized. Only the comparison of the file name fails. Fix this by using a case-insensitive comparison of source file names on platforms that do not have case-sensitive filesystems.
* | | Merge topic 'revert-cached-regex-clear-for-master'Brad King2014-12-015-60/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | 808c77e2 Merge branch 'revert-cached-regex-clear' into revert-cached-regex-clear-for-master 7d674b5f Revert "ClearMatches: Only clear matches which were actually set" (#15261)
| * \ \ Merge branch 'revert-cached-regex-clear' into ↵Brad King2014-11-265-60/+43
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | revert-cached-regex-clear-for-master Resolve conflict in Source/cmMakefile.h by integrating both changes.
| | * | | Revert "ClearMatches: Only clear matches which were actually set" (#15261)Ben Boeckel2014-11-265-60/+43
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit v3.1.0-rc1~557^2~2 (ClearMatches: Only clear matches which were actually set, 2014-03-12). The optimization did not track the match count in the same scope as the variables, allowing possible inconsistency. Resolve conflicts in Source/cmIfCommand.cxx, Source/cmMakefile.cxx, and Source/cmMakefile.h by moving the changes to the new location of the code involved.
| | * | Merge branch 'vs-check-phone-store-tools' into releaseBrad King2014-11-177-35/+242
| | |\ \
| | * \ \ Merge branch 'vs14-is-2015' into releaseBrad King2014-11-172-11/+31
| | |\ \ \
| | * \ \ \ Merge branch 'kwsys-SharedForward-vs14' into releaseBrad King2014-11-171-1/+1
| | |\ \ \ \
| | | * | | | KWSys SharedForward: Hard-code the ldpath buffer size to below VS 14 limitBrad King2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio 14 (2015) complains if a static character array is declared with more than 65535 elements. This limit should be large enough for SharedForward clients, so just hard-code that instead of trying to compute a limit.
| | * | | | | Merge branch 'vs-nsight-tegra-version' into releaseBrad King2014-11-131-2/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'no-cmake-self-install-when-cross-compiling' into releaseBrad King2014-11-131-1/+2
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-12-011-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-11-301-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-11-291-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-11-281-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-11-271-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'break-command-strictness'Brad King2014-11-267-1/+145
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d54617d0 break: Add policy CMP0055 to check calls strictly bae604d9 Track nested loop levels in CMake language with a stack of counters
| * | | | | | | break: Add policy CMP0055 to check calls strictlyGregor Jasny2014-11-253-1/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reject break() without loop scope or any arguments. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
| * | | | | | | Track nested loop levels in CMake language with a stack of countersGregor Jasny2014-11-254-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It gets incremented while entering a loop block (e.g. foreach or while) and gets decremented when leaving the block. Because scope borders for example at function borders must be taken into account the counter is put into a stack. With every new scope an empty counter is pushed on the stack, when leaving the scope the original value is restored. This will allow easy querying if the break command is properly nested within a loop scope. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | | Merge topic 'ccmake-system-form'Brad King2014-11-261-3/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b045c3b ccmake: Add CMAKE_USE_SYSTEM_FORM option to use libform instead of cmForm