diff options
author | Brad King <brad.king@kitware.com> | 2008-01-28 19:46:16 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-01-28 19:46:16 (GMT) |
commit | e3b1bdb058ac23bc535b941fc2ed66a410932d74 (patch) | |
tree | 9cecfe783ed59bb4995c206967b5416c0ee689dc /Tests/ExportImport/Import | |
parent | 437043bb04da113bf822aa42d5cf3a3cc3366be1 (diff) | |
download | CMake-e3b1bdb058ac23bc535b941fc2ed66a410932d74.zip CMake-e3b1bdb058ac23bc535b941fc2ed66a410932d74.tar.gz CMake-e3b1bdb058ac23bc535b941fc2ed66a410932d74.tar.bz2 |
ENH: Support exporting/importing of AppBundle targets.
- Imported bundles have the MACOSX_BUNDLE property set
- Added cmTarget::IsAppBundleOnApple method to simplify checks
- Document BUNDLE keyword in INSTALL command
- Updated IMPORTED_LOCATION property documentation for bundles
- Updated ExportImport test to test bundles
Diffstat (limited to 'Tests/ExportImport/Import')
-rw-r--r-- | Tests/ExportImport/Import/CMakeLists.txt | 12 | ||||
-rw-r--r-- | Tests/ExportImport/Import/imp_testExe1.c | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/Tests/ExportImport/Import/CMakeLists.txt b/Tests/ExportImport/Import/CMakeLists.txt index e6be1a8..b54a069 100644 --- a/Tests/ExportImport/Import/CMakeLists.txt +++ b/Tests/ExportImport/Import/CMakeLists.txt @@ -17,10 +17,16 @@ add_custom_command( COMMAND exp_testExe1 ${Import_BINARY_DIR}/exp_generated.c DEPENDS exp_testExe1 ) +add_custom_command( + OUTPUT ${Import_BINARY_DIR}/exp_generated3.c + COMMAND exp_testExe3 ${Import_BINARY_DIR}/exp_generated3.c + DEPENDS exp_testExe3 + ) add_executable(imp_testExe1 imp_testExe1.c ${Import_BINARY_DIR}/exp_generated.c + ${Import_BINARY_DIR}/exp_generated3.c ) # Try linking to a library imported from the install tree. @@ -36,10 +42,16 @@ add_custom_command( COMMAND bld_testExe1 ${Import_BINARY_DIR}/bld_generated.c DEPENDS bld_testExe1 ) +add_custom_command( + OUTPUT ${Import_BINARY_DIR}/bld_generated3.c + COMMAND bld_testExe3 ${Import_BINARY_DIR}/bld_generated3.c + DEPENDS bld_testExe3 + ) add_executable(imp_testExe1b imp_testExe1.c ${Import_BINARY_DIR}/bld_generated.c + ${Import_BINARY_DIR}/bld_generated3.c ) # Try linking to a library imported from the build tree. diff --git a/Tests/ExportImport/Import/imp_testExe1.c b/Tests/ExportImport/Import/imp_testExe1.c index 52ad8ff..0fbb689 100644 --- a/Tests/ExportImport/Import/imp_testExe1.c +++ b/Tests/ExportImport/Import/imp_testExe1.c @@ -1,9 +1,11 @@ extern int generated_by_testExe1(); +extern int generated_by_testExe3(); extern int testLib2(); extern int testLib3(); extern int testLib4(); int main() { - return testLib2() + generated_by_testExe1() + testLib3() + testLib4(); + return (testLib2() + generated_by_testExe1() + testLib3() + testLib4() + + generated_by_testExe3()); } |