diff options
| author | Brad King <brad.king@kitware.com> | 2008-01-28 18:06:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-01-28 18:06:17 (GMT) |
| commit | 611bff2c1b8a0ce533d92662504a391c9e3d494b (patch) | |
| tree | c0d1f7c40a01480c3769822dd9a24b7ec05dd418 | |
| parent | 28ea03473785eddce544704306a239407a8f79bb (diff) | |
| download | CMake-611bff2c1b8a0ce533d92662504a391c9e3d494b.zip CMake-611bff2c1b8a0ce533d92662504a391c9e3d494b.tar.gz CMake-611bff2c1b8a0ce533d92662504a391c9e3d494b.tar.bz2 | |
ENH: Added framework to ExportImport test.
| -rw-r--r-- | Tests/ExportImport/Export/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Tests/ExportImport/Export/testLib4.c | 7 | ||||
| -rw-r--r-- | Tests/ExportImport/Import/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/ExportImport/Import/imp_testExe1.c | 3 |
4 files changed, 17 insertions, 5 deletions
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt index eef146a..53fe705 100644 --- a/Tests/ExportImport/Export/CMakeLists.txt +++ b/Tests/ExportImport/Export/CMakeLists.txt @@ -16,18 +16,22 @@ target_link_libraries(testLib2 testLib1) add_library(testLib3 SHARED testLib3.c) +add_library(testLib4 SHARED testLib4.c) +set_property(TARGET testLib4 PROPERTY FRAMEWORK 1) + # Install and export from install tree. install( - TARGETS testExe1 testLib1 testLib2 testExe2 testLib3 + TARGETS testExe1 testLib1 testLib2 testExe2 testLib3 testLib4 EXPORT exp RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib + FRAMEWORK DESTINATION Frameworks ) install(EXPORT exp NAMESPACE exp_ DESTINATION lib/exp) # Export from build tree. -export(TARGETS testExe1 testLib1 testLib2 testExe2 testLib3 +export(TARGETS testExe1 testLib1 testLib2 testExe2 testLib3 testLib4 NAMESPACE bld_ FILE ExportBuildTree.cmake ) diff --git a/Tests/ExportImport/Export/testLib4.c b/Tests/ExportImport/Export/testLib4.c new file mode 100644 index 0000000..846b438 --- /dev/null +++ b/Tests/ExportImport/Export/testLib4.c @@ -0,0 +1,7 @@ +#if defined(_WIN32) || defined(__CYGWIN__) +# define testLib4_EXPORT __declspec(dllexport) +#else +# define testLib4_EXPORT +#endif + +testLib4_EXPORT int testLib4(void) { return 0; } diff --git a/Tests/ExportImport/Import/CMakeLists.txt b/Tests/ExportImport/Import/CMakeLists.txt index 4c19819..e6be1a8 100644 --- a/Tests/ExportImport/Import/CMakeLists.txt +++ b/Tests/ExportImport/Import/CMakeLists.txt @@ -24,7 +24,7 @@ add_executable(imp_testExe1 ) # Try linking to a library imported from the install tree. -target_link_libraries(imp_testExe1 exp_testLib2 exp_testLib3) +target_link_libraries(imp_testExe1 exp_testLib2 exp_testLib3 exp_testLib4) # Try building a plugin to an executable imported from the install tree. add_library(imp_mod1 MODULE imp_mod1.c) @@ -43,7 +43,7 @@ add_executable(imp_testExe1b ) # Try linking to a library imported from the build tree. -target_link_libraries(imp_testExe1b bld_testLib2 bld_testLib3) +target_link_libraries(imp_testExe1b bld_testLib2 bld_testLib3 bld_testLib4) # Try building a plugin to an executable imported from the build tree. add_library(imp_mod1b MODULE imp_mod1.c) diff --git a/Tests/ExportImport/Import/imp_testExe1.c b/Tests/ExportImport/Import/imp_testExe1.c index da51ddc..52ad8ff 100644 --- a/Tests/ExportImport/Import/imp_testExe1.c +++ b/Tests/ExportImport/Import/imp_testExe1.c @@ -1,8 +1,9 @@ extern int generated_by_testExe1(); extern int testLib2(); extern int testLib3(); +extern int testLib4(); int main() { - return testLib2() + generated_by_testExe1() + testLib3(); + return testLib2() + generated_by_testExe1() + testLib3() + testLib4(); } |