diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-01-21 19:32:58 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-01-21 19:32:58 +0000 |
| commit | b285de6acd998c591e3383dd69558c89f215f573 (patch) | |
| tree | 4eb71b068c13b927ff2a6a50d356234df75b13c8 /Graphics/GraphicsEngineVulkan | |
| parent | Fixed shared libaries on linux/mac/iOS (diff) | |
| download | DiligentCore-b285de6acd998c591e3383dd69558c89f215f573.tar.gz DiligentCore-b285de6acd998c591e3383dd69558c89f215f573.zip | |
Fixed --whole-archive flag on Mac and iOS
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
| -rw-r--r-- | Graphics/GraphicsEngineVulkan/CMakeLists.txt | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt index 767b20d3..251bee28 100644 --- a/Graphics/GraphicsEngineVulkan/CMakeLists.txt +++ b/Graphics/GraphicsEngineVulkan/CMakeLists.txt @@ -189,15 +189,19 @@ set(PUBLIC_DEPENDENCIES GraphicsEngineVkInterface ) -target_link_libraries(GraphicsEngineVk-static PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) -target_link_libraries(GraphicsEngineVk-shared PRIVATE BuildSettings PUBLIC ${PUBLIC_DEPENDENCIES}) - -if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR - CMAKE_CXX_COMPILER_ID MATCHES "GNU") - target_link_libraries(GraphicsEngineVk-shared PRIVATE -Wl,--whole-archive GraphicsEngineVk-static -Wl,--no-whole-archive) -else() - target_link_libraries(GraphicsEngineVk-shared PRIVATE GraphicsEngineVk-static) -endif() +target_link_libraries(GraphicsEngineVk-static +PRIVATE + ${PRIVATE_DEPENDENCIES} +PUBLIC + ${PUBLIC_DEPENDENCIES} +) +target_link_libraries(GraphicsEngineVk-shared +PRIVATE + BuildSettings + ${WHOLE_ARCHIVE_FLAG} GraphicsEngineVk-static ${NO_WHOLE_ARCHIVE_FLAG} +PUBLIC + ${PUBLIC_DEPENDENCIES} +) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # Disable the following clang warning |