From b285de6acd998c591e3383dd69558c89f215f573 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 21 Jan 2019 11:32:58 -0800 Subject: Fixed --whole-archive flag on Mac and iOS --- Graphics/GraphicsEngineVulkan/CMakeLists.txt | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') 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 -- cgit v1.2.3