diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-02-03 21:57:22 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-02-03 21:57:22 +0000 |
| commit | b7b840676c4a77d748e93624edaabd389e359ac5 (patch) | |
| tree | 3532bb5ec78dea0bfa96fbb9c513623cef3e9291 /Graphics/GraphicsEngineOpenGL | |
| parent | Fixed formatting (diff) | |
| download | DiligentCore-b7b840676c4a77d748e93624edaabd389e359ac5.tar.gz DiligentCore-b7b840676c4a77d748e93624edaabd389e359ac5.zip | |
Disallowed missing direct and indirect dependencies when linking GL and VK shared libs on Linux (fixed https://github.com/DiligentGraphics/DiligentCore/issues/119)
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt index d118a30c..0039de56 100644 --- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt +++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt @@ -176,7 +176,7 @@ if(PLATFORM_WIN32) elseif(PLATFORM_ANDROID) set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL android) elseif(PLATFORM_LINUX) - set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static) + set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static GL X11) elseif(PLATFORM_MACOS) find_package(OpenGL REQUIRED) set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static ${OPENGL_LIBRARY}) @@ -192,6 +192,11 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # as hiding is intended target_compile_options(Diligent-GraphicsEngineOpenGL-static PRIVATE -Wno-overloaded-virtual) target_compile_options(Diligent-GraphicsEngineOpenGL-shared PRIVATE -Wno-overloaded-virtual) +elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU") + set_target_properties(Diligent-GraphicsEngineOpenGL-shared PROPERTIES + # Disallow missing direct and indirect dependencies to enssure that .so is self-contained + LINK_FLAGS "-Wl,--no-undefined -Wl,--no-allow-shlib-undefined" + ) endif() target_link_libraries(Diligent-GraphicsEngineOpenGL-static |