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/GraphicsEngineOpenGL | |
| 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/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/CMakeLists.txt | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt index b2b1c1ee..bfde3d05 100644 --- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt +++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt @@ -189,14 +189,19 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_compile_options(GraphicsEngineOpenGL-shared PRIVATE -Wno-overloaded-virtual) endif() -target_link_libraries(GraphicsEngineOpenGL-static PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) -target_link_libraries(GraphicsEngineOpenGL-shared PRIVATE BuildSettings PUBLIC ${PUBLIC_DEPENDENCIES}) -if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR - CMAKE_CXX_COMPILER_ID MATCHES "GNU") - target_link_libraries(GraphicsEngineOpenGL-shared PRIVATE -Wl,--whole-archive GraphicsEngineOpenGL-static -Wl,--no-whole-archive) -else() - target_link_libraries(GraphicsEngineOpenGL-shared PRIVATE GraphicsEngineOpenGL-static) -endif() +target_link_libraries(GraphicsEngineOpenGL-static +PRIVATE + ${PRIVATE_DEPENDENCIES} +PUBLIC + ${PUBLIC_DEPENDENCIES} +) +target_link_libraries(GraphicsEngineOpenGL-shared +PRIVATE + BuildSettings + ${WHOLE_ARCHIVE_FLAG} GraphicsEngineOpenGL-static ${NO_WHOLE_ARCHIVE_FLAG} +PUBLIC + ${PUBLIC_DEPENDENCIES} +) target_compile_definitions(GraphicsEngineOpenGL-shared PUBLIC ENGINE_DLL=1) @@ -242,4 +247,4 @@ set_source_files_properties( if(INSTALL_DILIGENT_CORE) install_core_lib(GraphicsEngineOpenGL-shared) install_core_lib(GraphicsEngineOpenGL-static) -endif()
\ No newline at end of file +endif() |