diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2013-05-05 20:19:05 -0600 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-05-23 10:42:49 -0400 |
| commit | 373faae5e1c936351b143b0561c61ef9884303e1 (patch) | |
| tree | d5559e6ed2dea2570492c1004c493bfcba76cb1e /Tests/BundleUtilities | |
| parent | 78185f598c152b1dbce632e953874ce8132c5fe9 (diff) | |
| download | cmake-373faae5e1c936351b143b0561c61ef9884303e1.tar.gz | |
Refactor how bundles and frameworks are supported.
Make handling of directory separators consistent between
non-bundle and bundle code.
Remove xcode specific flag from cmTarget when getting install_name.
Add (more) consistent convenience functions in cmTarget to get
directories inside of bundles and frameworks to add files to.
This refactor also fixes bug #12263 where frameworks
had the wrong install name when SKIP_BUILD_RPATH.
Also make install_name for frameworks consistent between Makefile
and Xcode generator.
Diffstat (limited to 'Tests/BundleUtilities')
| -rw-r--r-- | Tests/BundleUtilities/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Tests/BundleUtilities/CMakeLists.txt b/Tests/BundleUtilities/CMakeLists.txt index 8f24afe9ab..5cc7071b49 100644 --- a/Tests/BundleUtilities/CMakeLists.txt +++ b/Tests/BundleUtilities/CMakeLists.txt @@ -12,8 +12,7 @@ add_library(shared2 SHARED shared2.cpp shared2.h) # a framework library add_library(framework SHARED framework.cpp framework.h) -# TODO: fix problems with local frameworks without rpaths -#set_target_properties(framework PROPERTIES FRAMEWORK 1) +set_target_properties(framework PROPERTIES FRAMEWORK 1) # make sure rpaths are not helping BundleUtilities or the executables set_target_properties(shared shared2 framework PROPERTIES |