Browse Source

CMake: force static plugins on iOS and WinRT.

Not sure why this was not enabled for ages already.
pull/233/head
Vladimír Vondruš 8 years ago
parent
commit
4641972e4d
  1. 3
      CMakeLists.txt
  2. 4
      doc/building.dox
  3. 1
      package/ci/appveyor-rt.bat
  4. 1
      package/ci/travis-ios-simulator.sh

3
CMakeLists.txt

@ -193,6 +193,9 @@ cmake_dependent_option(WITH_OPENGLTESTER "Build OpenGLTester library" OFF "NOT B
if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID) if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
set(BUILD_STATIC ON) set(BUILD_STATIC ON)
set(BUILD_PLUGINS_STATIC ON) set(BUILD_PLUGINS_STATIC ON)
# Dynamic plugins are not working on iOS or Windows RT at the moment
elseif(CORRADE_TARGET_IOS OR CORRADE_TARGET_WINDOWS_RT)
set(BUILD_PLUGINS_STATIC ON)
endif() endif()
if(BUILD_STATIC) if(BUILD_STATIC)

4
doc/building.dox

@ -816,8 +816,8 @@ architectures in `CMAKE_OSX_ARCHITECTURES`. Be sure to set
As every application is in its own sandbox, it doesn't make sense to build As every application is in its own sandbox, it doesn't make sense to build
shared libraries (although it is supported). Enable `BUILD_STATIC` to build shared libraries (although it is supported). Enable `BUILD_STATIC` to build
static libraries. You might also have problems using dynamic plugins, enable static libraries. Dynamically loaded plugins are not supported on iOS at the
`BUILD_PLUGINS_STATIC` to build also plugins as static. OpenGL ES 2.0 is moment, thus `BUILD_PLUGINS_STATIC` is implicitly enabled. OpenGL ES 2.0 is
enabled by default, switch to 3.0 by disabling `TARGET_GLES2`. enabled by default, switch to 3.0 by disabling `TARGET_GLES2`.
Please note that `BUILD_MULTITHREADED` is supported only since Xcode 7.3 and Please note that `BUILD_MULTITHREADED` is supported only since Xcode 7.3 and

1
package/ci/appveyor-rt.bat

@ -78,6 +78,5 @@ cmake .. ^
-DTARGET_GLES2=%TARGET_GLES2% ^ -DTARGET_GLES2=%TARGET_GLES2% ^
-DBUILD_TESTS=ON ^ -DBUILD_TESTS=ON ^
-DBUILD_STATIC=ON ^ -DBUILD_STATIC=ON ^
-DBUILD_PLUGINS_STATIC=ON ^
-G "%GENERATOR%" -A x64 || exit /b -G "%GENERATOR%" -A x64 || exit /b
cmake --build . --config Release -- /m /v:m || exit /b cmake --build . --config Release -- /m /v:m || exit /b

1
package/ci/travis-ios-simulator.sh

@ -60,7 +60,6 @@ cmake .. \
-DWITH_TGAIMPORTER=ON \ -DWITH_TGAIMPORTER=ON \
-DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \
-DBUILD_STATIC=ON \ -DBUILD_STATIC=ON \
-DBUILD_PLUGINS_STATIC=ON \
-DBUILD_TESTS=ON \ -DBUILD_TESTS=ON \
-DBUILD_GL_TESTS=ON \ -DBUILD_GL_TESTS=ON \
-G Xcode -G Xcode

Loading…
Cancel
Save