From 76f4bd9a9dc487d9e88342a11b11b14d247782a0 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Wed, 17 Sep 2014 10:07:21 -0700 Subject: [PATCH] fix CMakeLists.txt on Mac/Linux when using BUILD_SHARED_LIBS --- btgui/Bullet3AppSupport/CMakeLists.txt | 3 +-- btgui/Gwen/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/btgui/Bullet3AppSupport/CMakeLists.txt b/btgui/Bullet3AppSupport/CMakeLists.txt index e63c594fa..da529f22a 100644 --- a/btgui/Bullet3AppSupport/CMakeLists.txt +++ b/btgui/Bullet3AppSupport/CMakeLists.txt @@ -24,7 +24,6 @@ elseif (APPLE) endif () if (BUILD_SHARED_LIBS) - target_link_libraries(Bullet3AppSupport OpenGLWindow Bullet3Common) + target_link_libraries(Bullet3AppSupport gwen OpenGLWindow ${OPENGL_gl_LIBRARY} BulletCollision LinearMath Bullet3Common) endif() -target_link_libraries(Bullet3AppSupport ${OPENGL_gl_LIBRARY}) diff --git a/btgui/Gwen/CMakeLists.txt b/btgui/Gwen/CMakeLists.txt index 4deedbd42..6ab8afd74 100644 --- a/btgui/Gwen/CMakeLists.txt +++ b/btgui/Gwen/CMakeLists.txt @@ -10,4 +10,6 @@ FILE(GLOB gwen_SRCS "*.cpp" "Controls/*.cpp" "Controls/Dialog/*.cpp" "Controls/D FILE(GLOB gwen_HDRS "*.h" "Controls/*.h" "Controls/Dialog/*.h" "Controls/Dialogs/*.h" "Controls/Layout/*.h" "Controls/Property/*.h" "Input/*.h" "Platforms/*.h" "Renderers/*.h" "Skins/*.h") ADD_LIBRARY(gwen ${gwen_SRCS} ${gwen_HDRS}) - +if (BUILD_SHARED_LIBS) + target_link_libraries(gwen ${OPENGL_gl_LIBRARY}) +endif()