[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1097-g86907c9
Brad King
brad.king at kitware.com
Fri Jul 17 10:35:47 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 86907c983872159978b1b29b0d05949fe9612bf4 (commit)
via d7b9ced9344deb3b93771eca616b02e98fe7dedf (commit)
from 691aa02ebaca94f0ff85c0a0e4d06403bb20079d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86907c983872159978b1b29b0d05949fe9612bf4
commit 86907c983872159978b1b29b0d05949fe9612bf4
Merge: 691aa02 d7b9ced
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 17 10:35:46 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 17 10:35:46 2015 -0400
Merge topic 'OUTPUT_DIRECTORY-genex' into next
d7b9ced9 Revert "Add genex for {ARCHIVE,LIBRARY,RUNTIME}_OUTPUT_DIRECTORY[_<CONFIG>]"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7b9ced9344deb3b93771eca616b02e98fe7dedf
commit d7b9ced9344deb3b93771eca616b02e98fe7dedf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 17 10:30:51 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 17 10:30:51 2015 -0400
Revert "Add genex for {ARCHIVE,LIBRARY,RUNTIME}_OUTPUT_DIRECTORY[_<CONFIG>]"
This reverts commit f6f05443fc31a3ffbd6f302d52e8e3af2da7b8b3.
Currently referencing $<TARGET_FILE_DIR:...> in a target's own
output directory property leads to a crash.
diff --git a/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst b/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst
index 089004f..4221069 100644
--- a/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst
+++ b/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst
@@ -6,7 +6,4 @@ ARCHIVE_OUTPUT_DIRECTORY
.. |CMAKE_XXX_OUTPUT_DIRECTORY| replace:: CMAKE_ARCHIVE_OUTPUT_DIRECTORY
.. include:: XXX_OUTPUT_DIRECTORY.txt
-Contents of ``ARCHIVE_OUTPUT_DIRECTORY`` may use
-:manual:`generator expressions <cmake-generator-expressions(7)>`.
-
See also the :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>` target property.
diff --git a/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst b/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
index 12f8bb7..29991eb 100644
--- a/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
+++ b/Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst
@@ -11,6 +11,3 @@ per-configuration subdirectory to the specified directory. This
property is initialized by the value of the
:variable:`CMAKE_ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>` variable if
it is set when a target is created.
-
-Contents of ``ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>`` may use
-:manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst b/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst
index cdb8b37..785a57b 100644
--- a/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst
+++ b/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst
@@ -6,7 +6,4 @@ LIBRARY_OUTPUT_DIRECTORY
.. |CMAKE_XXX_OUTPUT_DIRECTORY| replace:: CMAKE_LIBRARY_OUTPUT_DIRECTORY
.. include:: XXX_OUTPUT_DIRECTORY.txt
-Contents of ``LIBRARY_OUTPUT_DIRECTORY`` may use
-:manual:`generator expressions <cmake-generator-expressions(7)>`.
-
See also the :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY_<CONFIG>` target property.
diff --git a/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst b/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst
index 28dd404..6fc0142 100644
--- a/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst
+++ b/Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst
@@ -11,6 +11,3 @@ per-configuration subdirectory to the specified directory. This
property is initialized by the value of the
:variable:`CMAKE_LIBRARY_OUTPUT_DIRECTORY_<CONFIG>` variable if
it is set when a target is created.
-
-Contents of ``LIBRARY_OUTPUT_DIRECTORY_<CONFIG>`` may use
-:manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.rst b/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.rst
index 46f597c..12390f5 100644
--- a/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.rst
+++ b/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.rst
@@ -6,7 +6,4 @@ RUNTIME_OUTPUT_DIRECTORY
.. |CMAKE_XXX_OUTPUT_DIRECTORY| replace:: CMAKE_RUNTIME_OUTPUT_DIRECTORY
.. include:: XXX_OUTPUT_DIRECTORY.txt
-Contents of ``RUNTIME_OUTPUT_DIRECTORY`` may use
-:manual:`generator expressions <cmake-generator-expressions(7)>`.
-
See also the :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY_<CONFIG>` target property.
diff --git a/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst b/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst
index 94fb277..c100346 100644
--- a/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst
+++ b/Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst
@@ -11,6 +11,3 @@ per-configuration subdirectory to the specified directory. This
property is initialized by the value of the
:variable:`CMAKE_RUNTIME_OUTPUT_DIRECTORY_<CONFIG>` variable if
it is set when a target is created.
-
-Contents of ``RUNTIME_OUTPUT_DIRECTORY_<CONFIG>`` may use
-:manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Help/release/dev/OUTPUT_DIRECTORY-genex.rst b/Help/release/dev/OUTPUT_DIRECTORY-genex.rst
deleted file mode 100644
index 8b839c0..0000000
--- a/Help/release/dev/OUTPUT_DIRECTORY-genex.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-OUTPUT_DIRECTORY-genex
-----------------------
-
-* The :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`,
- :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and
- :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` target properties learned to
- support :manual:`generator expressions <cmake-generator-expressions(7)>`.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 39c8345..0303f1e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4466,10 +4466,7 @@ bool cmTarget::ComputeOutputDir(const std::string& config,
if(const char* config_outdir = this->GetProperty(configProp))
{
// Use the user-specified per-configuration output directory.
- cmGeneratorExpression ge;
- cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
- ge.Parse(config_outdir);
- out = cge->Evaluate(this->Makefile, config);
+ out = config_outdir;
// Skip per-configuration subdirectory.
conf = "";
@@ -4477,10 +4474,7 @@ bool cmTarget::ComputeOutputDir(const std::string& config,
else if(const char* outdir = this->GetProperty(propertyName))
{
// Use the user-specified output directory.
- cmGeneratorExpression ge;
- cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
- ge.Parse(outdir);
- out = cge->Evaluate(this->Makefile, config);
+ out = outdir;
}
else if(this->GetType() == cmTarget::EXECUTABLE)
{
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index 7fdfaa8..df3f178 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -105,19 +105,6 @@ target_link_libraries(testLib4
add_executable(testExe3 testExe3.c)
set_property(TARGET testExe3 PROPERTY MACOSX_BUNDLE 1)
-# Test <ARCHIVE|LIBRARY|RUNTIME>_OUTPUT_DIRECTORY[_<CONFIG>] properties with generator expressions
-add_executable(testExe4 testExe4.c)
-target_link_libraries(testExe4 testExe1lib)
-set_property(TARGET testLib7 PROPERTY ARCHIVE_OUTPUT_DIRECTORY_DEBUG testLib7D-$<CONFIG>)
-set_property(TARGET testLib7 PROPERTY ARCHIVE_OUTPUT_DIRECTORY_RELEASE testLib7R-$<CONFIG>)
-set_property(TARGET testLib7 PROPERTY ARCHIVE_OUTPUT_DIRECTORY testLib7-$<CONFIG>)
-set_property(TARGET testLib5 PROPERTY LIBRARY_OUTPUT_DIRECTORY_DEBUG testLib5D-$<CONFIG>)
-set_property(TARGET testLib5 PROPERTY LIBRARY_OUTPUT_DIRECTORY_RELEASE testLib5R-$<CONFIG>)
-set_property(TARGET testLib5 PROPERTY LIBRARY_OUTPUT_DIRECTORY testLib5-$<CONFIG>)
-set_property(TARGET testExe4 PROPERTY RUNTIME_OUTPUT_DIRECTORY_DEBUG testExe4D-$<CONFIG>)
-set_property(TARGET testExe4 PROPERTY RUNTIME_OUTPUT_DIRECTORY_RELEASE testExe4R-$<CONFIG>)
-set_property(TARGET testExe4 PROPERTY RUNTIME_OUTPUT_DIRECTORY testExe4-$<CONFIG>)
-
# Test cyclic dependencies.
add_library(testLibCycleA STATIC
testLibCycleA1.c testLibCycleA2.c testLibCycleA3.c)
@@ -463,7 +450,7 @@ install(FILES
# Install and export from install tree.
install(
TARGETS
- testExe1 testLib1 testLib2 testExe2 testLib3 testLib4 testExe3 testExe4
+ testExe1 testLib1 testLib2 testExe2 testLib3 testLib4 testExe3
testExe2lib testLib4lib testLib4libdbg testLib4libopt
testLib6 testLib7
testLibCycleA testLibCycleB
@@ -524,7 +511,7 @@ export(TARGETS testExe1 testLib1 testLib2 testLib3
NAMESPACE bld_
FILE ExportBuildTree.cmake
)
-export(TARGETS testExe2 testLib4 testLib5 testLib6 testLib7 testExe3 testExe4 testExe2lib
+export(TARGETS testExe2 testLib4 testLib5 testLib6 testLib7 testExe3 testExe2lib
testLib4lib testLib4libdbg testLib4libopt
testLibCycleA testLibCycleB
testLibPerConfigDest
diff --git a/Tests/ExportImport/Export/testExe4.c b/Tests/ExportImport/Export/testExe4.c
deleted file mode 100644
index 731057e..0000000
--- a/Tests/ExportImport/Export/testExe4.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <stdio.h>
-
-int main(int argc, const char* argv[])
-{
- if(argc < 2)
- {
- fprintf(stderr, "Must specify output file.\n");
- return 1;
- }
- {
- FILE* f = fopen(argv[1], "w");
- if(f)
- {
- fprintf(f, "int generated_by_testExe4() { return 0; }\n");
- fclose(f);
- }
- else
- {
- fprintf(stderr, "Error writing to %s\n", argv[1]);
- return 1;
- }
- }
- return 0;
-}
diff --git a/Tests/ExportImport/Import/A/CMakeLists.txt b/Tests/ExportImport/Import/A/CMakeLists.txt
index 0f56495..a74bad1 100644
--- a/Tests/ExportImport/Import/A/CMakeLists.txt
+++ b/Tests/ExportImport/Import/A/CMakeLists.txt
@@ -19,17 +19,11 @@ add_custom_command(
COMMAND exp_testExe3 ${Import_BINARY_DIR}/exp_generated3.c
DEPENDS exp_testExe3
)
-add_custom_command(
- OUTPUT ${Import_BINARY_DIR}/exp_generated4.c
- COMMAND exp_testExe4 ${Import_BINARY_DIR}/exp_generated4.c
- DEPENDS exp_testExe4
- )
add_executable(imp_testExe1
imp_testExe1.c
${Import_BINARY_DIR}/exp_generated.c
${Import_BINARY_DIR}/exp_generated3.c
- ${Import_BINARY_DIR}/exp_generated4.c
)
# Try linking to a library imported from the install tree.
@@ -59,17 +53,11 @@ add_custom_command(
COMMAND bld_testExe3 ${Import_BINARY_DIR}/bld_generated3.c
DEPENDS bld_testExe3
)
-add_custom_command(
- OUTPUT ${Import_BINARY_DIR}/bld_generated4.c
- COMMAND bld_testExe4 ${Import_BINARY_DIR}/bld_generated4.c
- DEPENDS bld_testExe4
- )
add_executable(imp_testExe1b
imp_testExe1.c
${Import_BINARY_DIR}/bld_generated.c
${Import_BINARY_DIR}/bld_generated3.c
- ${Import_BINARY_DIR}/bld_generated4.c
)
# Try linking to a library imported from the build tree.
diff --git a/Tests/ExportImport/Import/A/imp_testExe1.c b/Tests/ExportImport/Import/A/imp_testExe1.c
index 0a74309..56cdd2c 100644
--- a/Tests/ExportImport/Import/A/imp_testExe1.c
+++ b/Tests/ExportImport/Import/A/imp_testExe1.c
@@ -1,6 +1,5 @@
extern int generated_by_testExe1();
extern int generated_by_testExe3();
-extern int generated_by_testExe4();
extern int testLib2();
extern int testLib3();
extern int testLib4();
@@ -25,5 +24,5 @@ int main()
return (testLib2() + generated_by_testExe1() + testLib3() + testLib4()
+ testLib5() + testLib6() + testLib7() + testLibCycleA1()
+ testLibPerConfigDest()
- + generated_by_testExe3() + generated_by_testExe4() + testLib4lib() + testLib4libcfg());
+ + generated_by_testExe3() + testLib4lib() + testLib4libcfg());
}
-----------------------------------------------------------------------
Summary of changes:
Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY.rst | 3 ---
Help/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.rst | 3 ---
Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY.rst | 3 ---
Help/prop_tgt/LIBRARY_OUTPUT_DIRECTORY_CONFIG.rst | 3 ---
Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.rst | 3 ---
Help/prop_tgt/RUNTIME_OUTPUT_DIRECTORY_CONFIG.rst | 3 ---
Help/release/dev/OUTPUT_DIRECTORY-genex.rst | 7 ------
Source/cmTarget.cxx | 10 ++-------
Tests/ExportImport/Export/CMakeLists.txt | 17 ++-------------
Tests/ExportImport/Export/testExe4.c | 24 ---------------------
Tests/ExportImport/Import/A/CMakeLists.txt | 12 -----------
Tests/ExportImport/Import/A/imp_testExe1.c | 3 +--
12 files changed, 5 insertions(+), 86 deletions(-)
delete mode 100644 Help/release/dev/OUTPUT_DIRECTORY-genex.rst
delete mode 100644 Tests/ExportImport/Export/testExe4.c
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list