diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-08 19:10:22 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-08 19:10:22 (GMT) |
| commit | faa927e273e04b9aadc13fb1f2b8b307b7383cd2 (patch) | |
| tree | c6b6764c2d46c0a47e42cee2249391ca8f7a2747 /Tests/ObjectLibrary/B | |
| parent | 510fdcb18801076e2041eaae2941375eecc93ec2 (diff) | |
| download | CMake-faa927e273e04b9aadc13fb1f2b8b307b7383cd2.zip CMake-faa927e273e04b9aadc13fb1f2b8b307b7383cd2.tar.gz CMake-faa927e273e04b9aadc13fb1f2b8b307b7383cd2.tar.bz2 | |
Make sure INTERFACE properties work with OBJECT libraries.
Diffstat (limited to 'Tests/ObjectLibrary/B')
| -rw-r--r-- | Tests/ObjectLibrary/B/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/ObjectLibrary/B/b.h | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Tests/ObjectLibrary/B/CMakeLists.txt b/Tests/ObjectLibrary/B/CMakeLists.txt index 32d8ceb..a567f96 100644 --- a/Tests/ObjectLibrary/B/CMakeLists.txt +++ b/Tests/ObjectLibrary/B/CMakeLists.txt @@ -10,7 +10,11 @@ if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM) set(CMAKE_C_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS}") endif() -add_definitions(-DB_DEF) add_library(B OBJECT b1.c b2.c) +target_include_directories(B PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_compile_definitions(B PUBLIC B_DEF) + add_library(Bexport OBJECT b1${vs6}.c b2${vs6}.c) set_property(TARGET Bexport PROPERTY COMPILE_DEFINITIONS Bexport) +target_include_directories(Bexport PRIVATE $<TARGET_PROPERTY:B,INTERFACE_INCLUDE_DIRECTORIES>) +target_compile_definitions(Bexport PRIVATE $<TARGET_PROPERTY:B,INTERFACE_COMPILE_DEFINITIONS>) diff --git a/Tests/ObjectLibrary/B/b.h b/Tests/ObjectLibrary/B/b.h index 11b22f4..3489c71 100644 --- a/Tests/ObjectLibrary/B/b.h +++ b/Tests/ObjectLibrary/B/b.h @@ -4,8 +4,15 @@ #ifndef B_DEF # error "B_DEF not defined" #endif + #if defined(_WIN32) && defined(Bexport) # define EXPORT_B __declspec(dllexport) #else # define EXPORT_B #endif + +#if defined(_WIN32) && defined(SHARED_B) +# define IMPORT_B __declspec(dllimport) +#else +# define IMPORT_B +#endif |