mosra · mosra · Jul 28, 2016 · Jul 28, 2016 · Jul 28, 2016
diff --git a/src/Magnum/BulletIntegration/CMakeLists.txt b/src/Magnum/BulletIntegration/CMakeLists.txt
@@ -27,6 +27,13 @@
 find_package(Magnum REQUIRED SceneGraph Shapes)
 find_package(Bullet REQUIRED)
 
+if(BUILD_STATIC)
+    set(MAGNUM_BULLETINTEGRATION_BUILD_STATIC 1)
+endif()
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
+
 set(MagnumBulletIntegration_SRCS
     ConvertShape.cpp
     MotionState.cpp)
@@ -42,7 +49,9 @@ set(MagnumBulletIntegration_HEADERS
 add_library(MagnumBulletIntegration ${SHARED_OR_STATIC}
     ${MagnumBulletIntegration_SRCS}
     ${MagnumBulletIntegration_HEADERS})
-target_include_directories(MagnumBulletIntegration PUBLIC ${PROJECT_SOURCE_DIR}/src)
+target_include_directories(MagnumBulletIntegration PUBLIC
+    ${PROJECT_SOURCE_DIR}/src
+    ${PROJECT_BINARY_DIR}/src)
 # Silence pedantic warnings in Bullet headers
 target_include_directories(MagnumBulletIntegration SYSTEM PUBLIC ${BULLET_INCLUDE_DIRS})
 set_target_properties(MagnumBulletIntegration PROPERTIES DEBUG_POSTFIX "-d")
@@ -60,6 +69,7 @@ install(TARGETS MagnumBulletIntegration
     LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
     ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
 install(FILES ${MagnumBulletIntegration_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/BulletIntegration)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/BulletIntegration)
 
 if(BUILD_TESTS)
     add_subdirectory(Test)

diff --git a/src/Magnum/BulletIntegration/configure.h.cmake b/src/Magnum/BulletIntegration/configure.h.cmake
@@ -0,0 +1,26 @@
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+#cmakedefine MAGNUM_BULLETINTEGRATION_BUILD_STATIC
diff --git a/src/Magnum/BulletIntegration/visibility.h b/src/Magnum/BulletIntegration/visibility.h
@@ -28,10 +28,16 @@
 
 #include <Corrade/Utility/VisibilityMacros.h>
 
-#ifdef MagnumBulletIntegration_EXPORTS
-    #define MAGNUM_BULLETINTEGRATION_EXPORT CORRADE_VISIBILITY_EXPORT
+#include "Magnum/BulletIntegration/configure.h"
+
+#ifndef MAGNUM_BULLETINTEGRATION_BUILD_STATIC
+    #ifdef MagnumBulletIntegration_EXPORTS
+        #define MAGNUM_BULLETINTEGRATION_EXPORT CORRADE_VISIBILITY_EXPORT
+    #else
+        #define MAGNUM_BULLETINTEGRATION_EXPORT CORRADE_VISIBILITY_IMPORT
+    #endif
 #else
-    #define MAGNUM_BULLETINTEGRATION_EXPORT CORRADE_VISIBILITY_IMPORT
+    #define MAGNUM_BULLETINTEGRATION_EXPORT CORRADE_VISIBILITY_STATIC
 #endif
 #define MAGNUM_BULLETINTEGRATION_LOCAL CORRADE_VISIBILITY_LOCAL
 

diff --git a/src/Magnum/OvrIntegration/CMakeLists.txt b/src/Magnum/OvrIntegration/CMakeLists.txt
@@ -26,6 +26,13 @@
 
 find_package(OVR REQUIRED)
 
+if(BUILD_STATIC)
+    set(MAGNUM_OVRINTEGRATION_BUILD_STATIC 1)
+endif()
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
+
 set(MagnumOvrIntegration_SRCS
     Compositor.cpp
     Context.cpp
@@ -46,7 +53,9 @@ set(MagnumOvrIntegration_HEADERS
 add_library(MagnumOvrIntegration SHARED
     ${MagnumOvrIntegration_SRCS}
     ${MagnumOvrIntegration_HEADERS})
-target_include_directories(MagnumOvrIntegration PUBLIC ${PROJECT_SOURCE_DIR}/src)
+target_include_directories(MagnumOvrIntegration PUBLIC
+    ${PROJECT_SOURCE_DIR}/src
+    ${PROJECT_BINARY_DIR}/src)
 set_target_properties(MagnumOvrIntegration PROPERTIES DEBUG_POSTFIX "-d")
 if(BUILD_STATIC_PIC)
     set_target_properties(MagnumOvrIntegration PROPERTIES POSITION_INDEPENDENT_CODE ON)
@@ -60,6 +69,7 @@ install(TARGETS MagnumOvrIntegration
     LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
     ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
 install(FILES ${MagnumOvrIntegration_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/OvrIntegration)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/OvrIntegration)
 
 if(BUILD_TESTS)
     add_subdirectory(Test)

diff --git a/src/Magnum/OvrIntegration/configure.h.cmake b/src/Magnum/OvrIntegration/configure.h.cmake
@@ -0,0 +1,26 @@
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016
+              Vladimír Vondruš <mosra@centrum.cz>
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+*/
+
+#cmakedefine MAGNUM_OVRINTEGRATION_BUILD_STATIC
diff --git a/src/Magnum/OvrIntegration/visibility.h b/src/Magnum/OvrIntegration/visibility.h
@@ -28,10 +28,16 @@
 
 #include <Corrade/Utility/VisibilityMacros.h>
 
-#ifdef MagnumOvrIntegration_EXPORTS
-    #define MAGNUM_OVRINTEGRATION_EXPORT CORRADE_VISIBILITY_EXPORT
+#include "Magnum/OvrIntegration/configure.h"
+
+#ifndef MAGNUM_OVRINTEGRATION_BUILD_STATIC
+    #ifdef MagnumOvrIntegration_EXPORTS
+        #define MAGNUM_OVRINTEGRATION_EXPORT CORRADE_VISIBILITY_EXPORT
+    #else
+        #define MAGNUM_OVRINTEGRATION_EXPORT CORRADE_VISIBILITY_IMPORT
+    #endif
 #else
-    #define MAGNUM_OVRINTEGRATION_EXPORT CORRADE_VISIBILITY_IMPORT
+    #define MAGNUM_OVRINTEGRATION_EXPORT CORRADE_VISIBILITY_STATIC
 #endif
 
 #endif