diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-21 17:26:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-21 17:26:57 (GMT) |
| commit | a72893da36ce5a78043b333e4bd430df2fdb323d (patch) | |
| tree | 5f60fceb057e517793cffafe366cebdc65ced1e9 /Tests | |
| parent | 349ea3f6e6db59a4c1d3a1a8ea6a25e3f55ab713 (diff) | |
| parent | b291d9e756b76ce85ebcc314c14de532e8ad477f (diff) | |
| download | CMake-a72893da36ce5a78043b333e4bd430df2fdb323d.zip CMake-a72893da36ce5a78043b333e4bd430df2fdb323d.tar.gz CMake-a72893da36ce5a78043b333e4bd430df2fdb323d.tar.bz2 | |
Merge topic 'vs10-object-items'
b291d9e VS10: Fix external objects generated outside target (#13047)
328c0f6 Simplify cmVisualStudio10TargetGenerator source classification
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/ExternalOBJ/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ExternalOBJ/Sub/CMakeLists.txt | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Tests/ExternalOBJ/CMakeLists.txt b/Tests/ExternalOBJ/CMakeLists.txt index f12de11..683e799 100644 --- a/Tests/ExternalOBJ/CMakeLists.txt +++ b/Tests/ExternalOBJ/CMakeLists.txt @@ -59,3 +59,5 @@ ADD_EXECUTABLE(ExternalOBJ executable.cxx ${CUSTOM_OBJECT}) # not didn't work. So, repeat the executable using the object # directly and not from the output of the copy. ADD_EXECUTABLE(ExternalOBJ2 executable.cxx ${EXTERNAL_OBJECT}) + +ADD_SUBDIRECTORY(Sub) diff --git a/Tests/ExternalOBJ/Sub/CMakeLists.txt b/Tests/ExternalOBJ/Sub/CMakeLists.txt new file mode 100644 index 0000000..35cd30c --- /dev/null +++ b/Tests/ExternalOBJ/Sub/CMakeLists.txt @@ -0,0 +1,3 @@ +set_property(SOURCE ${CUSTOM_OBJECT} PROPERTY GENERATED 1) +add_executable(ExternalOBJSub ../executable.cxx ${CUSTOM_OBJECT}) +add_dependencies(ExternalOBJSub ExternalOBJ) # depend on generating target |