diff --git a/package/ci/android-x86-gles.sh b/package/ci/android-x86-gles.sh index 9fb709fce..2b7911bce 100755 --- a/package/ci/android-x86-gles.sh +++ b/package/ci/android-x86-gles.sh @@ -12,10 +12,10 @@ mkdir build && cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps-native \ -DCMAKE_BUILD_TYPE=Release \ - -DWITH_INTERCONNECT=OFF \ - -DWITH_PLUGINMANAGER=OFF \ - -DWITH_TESTSUITE=OFF \ - -DWITH_UTILITY=OFF \ + -DCORRADE_WITH_INTERCONNECT=OFF \ + -DCORRADE_WITH_PLUGINMANAGER=OFF \ + -DCORRADE_WITH_TESTSUITE=OFF \ + -DCORRADE_WITH_UTILITY=OFF \ -G Ninja ninja install cd .. @@ -29,9 +29,9 @@ cmake .. \ -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang \ -DCMAKE_ANDROID_STL_TYPE=c++_static \ -DCMAKE_BUILD_TYPE=Release \ - -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ - -DWITH_INTERCONNECT=OFF \ + -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ + -DCORRADE_WITH_INTERCONNECT=OFF \ -G Ninja ninja install cd .. @@ -51,10 +51,10 @@ cmake .. \ -DCMAKE_ANDROID_STL_TYPE=c++_static \ -DCMAKE_FIND_ROOT_PATH="/opt/android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/linux-x86_64/sysroot;$HOME/deps" \ -DCMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX=/i686-linux-android/29 \ - -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_PREFIX_PATH=$HOME/deps \ -DCMAKE_BUILD_TYPE=Release \ + -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DTARGET_GLES2=$TARGET_GLES2 \ -DWITH_AUDIO=OFF \ -DWITH_VK=OFF \ diff --git a/package/ci/android-x86-vulkan.sh b/package/ci/android-x86-vulkan.sh index 64053e43f..7421362ff 100755 --- a/package/ci/android-x86-vulkan.sh +++ b/package/ci/android-x86-vulkan.sh @@ -12,10 +12,10 @@ mkdir build && cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps-native \ -DCMAKE_BUILD_TYPE=Release \ - -DWITH_INTERCONNECT=OFF \ - -DWITH_PLUGINMANAGER=OFF \ - -DWITH_TESTSUITE=OFF \ - -DWITH_UTILITY=OFF \ + -DCORRADE_WITH_INTERCONNECT=OFF \ + -DCORRADE_WITH_PLUGINMANAGER=OFF \ + -DCORRADE_WITH_TESTSUITE=OFF \ + -DCORRADE_WITH_UTILITY=OFF \ -G Ninja ninja install cd .. @@ -29,9 +29,9 @@ cmake .. \ -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang \ -DCMAKE_ANDROID_STL_TYPE=c++_static \ -DCMAKE_BUILD_TYPE=Release \ - -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ - -DWITH_INTERCONNECT=OFF \ + -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ + -DCORRADE_WITH_INTERCONNECT=OFF \ -G Ninja ninja install cd .. @@ -54,10 +54,10 @@ cmake .. \ -DCMAKE_ANDROID_STL_TYPE=c++_static \ -DCMAKE_FIND_ROOT_PATH="/opt/android/sdk/ndk/21.4.7075529/toolchains/llvm/prebuilt/linux-x86_64/sysroot;$HOME/deps" \ -DCMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX=/i686-linux-android/29 \ - -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_PREFIX_PATH=$HOME/deps \ -DCMAKE_BUILD_TYPE=Release \ + -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DWITH_AUDIO=OFF \ `# Needed by VkMeshVkTest, together with TgaImporter and AnyImageImporter` \ -DWITH_DEBUGTOOLS=ON \ diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index d5d0f4eef..add8b0291 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -12,8 +12,8 @@ mkdir build && cd build || exit /b cmake .. ^ -DCMAKE_BUILD_TYPE=Debug ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DWITH_INTERCONNECT=OFF ^ - -DUTILITY_USE_ANSI_COLORS=ON ^ + -DCORRADE_WITH_INTERCONNECT=OFF ^ + -DCORRADE_UTILITY_USE_ANSI_COLORS=ON ^ -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/appveyor-desktop-mingw.bat b/package/ci/appveyor-desktop-mingw.bat index a7a3dff97..21ebf887e 100644 --- a/package/ci/appveyor-desktop-mingw.bat +++ b/package/ci/appveyor-desktop-mingw.bat @@ -12,8 +12,8 @@ cmake .. ^ -DCMAKE_CXX_FLAGS="--coverage" ^ -DCMAKE_BUILD_TYPE=Debug ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DWITH_INTERCONNECT=OFF ^ - -DUTILITY_USE_ANSI_COLORS=ON ^ + -DCORRADE_WITH_INTERCONNECT=OFF ^ + -DCORRADE_UTILITY_USE_ANSI_COLORS=ON ^ -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index b3e7083ba..79a64a188 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -20,9 +20,9 @@ mkdir build && cd build || exit /b cmake .. ^ -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DWITH_INTERCONNECT=OFF ^ - -DUTILITY_USE_ANSI_COLORS=ON ^ - -DBUILD_STATIC=%BUILD_STATIC% ^ + -DCORRADE_WITH_INTERCONNECT=OFF ^ + -DCORRADE_UTILITY_USE_ANSI_COLORS=ON ^ + -DCORRADE_BUILD_STATIC=%BUILD_STATIC% ^ %COMPILER_EXTRA% -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/appveyor-rt.bat b/package/ci/appveyor-rt.bat index c37705f9e..c4e5984bc 100644 --- a/package/ci/appveyor-rt.bat +++ b/package/ci/appveyor-rt.bat @@ -18,10 +18,10 @@ mkdir build && cd build || exit /b cmake .. ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps-native ^ - -DWITH_INTERCONNECT=OFF ^ - -DWITH_PLUGINMANAGER=OFF ^ - -DWITH_TESTSUITE=OFF ^ - -DWITH_UTILITY=OFF ^ + -DCORRADE_WITH_INTERCONNECT=OFF ^ + -DCORRADE_WITH_PLUGINMANAGER=OFF ^ + -DCORRADE_WITH_TESTSUITE=OFF ^ + -DCORRADE_WITH_UTILITY=OFF ^ -G Ninja || exit /b cmake --build . --target install || exit /b cd .. || exit /b @@ -31,10 +31,10 @@ mkdir build-rt && cd build-rt || exit /b cmake .. ^ -DCMAKE_SYSTEM_NAME=WindowsStore ^ -DCMAKE_SYSTEM_VERSION=10.0 ^ - -DCORRADE_RC_EXECUTABLE=%APPVEYOR_BUILD_FOLDER%/deps-native/bin/corrade-rc.exe ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DWITH_INTERCONNECT=OFF ^ - -DBUILD_STATIC=ON ^ + -DCORRADE_RC_EXECUTABLE=%APPVEYOR_BUILD_FOLDER%/deps-native/bin/corrade-rc.exe ^ + -DCORRADE_WITH_INTERCONNECT=OFF ^ + -DCORRADE_BUILD_STATIC=ON ^ -G "%GENERATOR%" -A x64 || exit /b cmake --build . --config Release --target install -- /m /v:m || exit /b cd .. || exit /b @@ -46,10 +46,10 @@ mkdir build-rt && cd build-rt || exit /b cmake .. ^ -DCMAKE_SYSTEM_NAME=WindowsStore ^ -DCMAKE_SYSTEM_VERSION=10.0 ^ - -DCORRADE_RC_EXECUTABLE=%APPVEYOR_BUILD_FOLDER%/deps-native/bin/corrade-rc.exe ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/deps ^ -DSDL2_LIBRARY_RELEASE=%APPVEYOR_BUILD_FOLDER%/SDL/VisualC-WinRT/UWP_VS2015/X64/Release/SDL-UWP/SDL2.lib ^ -DSDL2_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%/SDL/include ^ + -DCORRADE_RC_EXECUTABLE=%APPVEYOR_BUILD_FOLDER%/deps-native/bin/corrade-rc.exe ^ -DWITH_AUDIO=OFF ^ -DWITH_SDL2APPLICATION=ON ^ -DWITH_ANYAUDIOIMPORTER=OFF ^ diff --git a/package/ci/emscripten.sh b/package/ci/emscripten.sh index 48e3394d5..94c8d6944 100755 --- a/package/ci/emscripten.sh +++ b/package/ci/emscripten.sh @@ -12,10 +12,10 @@ mkdir build && cd build cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$HOME/deps-native \ - -DWITH_INTERCONNECT=OFF \ - -DWITH_PLUGINMANAGER=OFF \ - -DWITH_TESTSUITE=OFF \ - -DWITH_UTILITY=OFF \ + -DCORRADE_WITH_INTERCONNECT=OFF \ + -DCORRADE_WITH_PLUGINMANAGER=OFF \ + -DCORRADE_WITH_TESTSUITE=OFF \ + -DCORRADE_WITH_UTILITY=OFF \ -G Ninja ninja install cd .. @@ -23,13 +23,13 @@ cd .. # Crosscompile Corrade mkdir build-emscripten && cd build-emscripten cmake .. \ - -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DCMAKE_TOOLCHAIN_FILE="../../toolchains/generic/Emscripten-wasm.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O1" \ -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-O1" \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ - -DWITH_INTERCONNECT=OFF \ + -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ + -DCORRADE_WITH_INTERCONNECT=OFF \ -G Ninja ninja install cd .. @@ -39,13 +39,13 @@ cd .. # Crosscompile mkdir build-emscripten && cd build-emscripten cmake .. \ - -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Emscripten-wasm.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O1" \ -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-O1" \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_FIND_ROOT_PATH=$HOME/deps \ + -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DWITH_AUDIO=ON \ -DWITH_VK=OFF \ -DWITH_EMSCRIPTENAPPLICATION=ON \ diff --git a/package/ci/ios-simulator-gles.sh b/package/ci/ios-simulator-gles.sh index ff2e9a93e..59188a6f8 100755 --- a/package/ci/ios-simulator-gles.sh +++ b/package/ci/ios-simulator-gles.sh @@ -12,10 +12,10 @@ mkdir build && cd build cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$HOME/deps-native \ - -DWITH_INTERCONNECT=OFF \ - -DWITH_PLUGINMANAGER=OFF \ - -DWITH_TESTSUITE=OFF \ - -DWITH_UTILITY=OFF \ + -DCORRADE_WITH_INTERCONNECT=OFF \ + -DCORRADE_WITH_PLUGINMANAGER=OFF \ + -DCORRADE_WITH_TESTSUITE=OFF \ + -DCORRADE_WITH_UTILITY=OFF \ -G Ninja ninja install cd .. @@ -26,11 +26,11 @@ cmake .. \ -DCMAKE_TOOLCHAIN_FILE=../../toolchains/generic/iOS.cmake \ -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk \ -DCMAKE_OSX_ARCHITECTURES="x86_64" \ - -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ - -DBUILD_STATIC=ON \ - -DTESTSUITE_TARGET_XCTEST=ON \ - -DWITH_INTERCONNECT=OFF \ + -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ + -DCORRADE_BUILD_STATIC=ON \ + -DCORRADE_TESTSUITE_TARGET_XCTEST=ON \ + -DCORRADE_WITH_INTERCONNECT=OFF \ -G Xcode set -o pipefail && cmake --build . --config Release --target install | xcbeautify cd ../.. @@ -53,8 +53,8 @@ cmake .. \ -DCMAKE_TOOLCHAIN_FILE=../toolchains/generic/iOS.cmake \ -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk \ -DCMAKE_OSX_ARCHITECTURES="x86_64" \ - -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DCMAKE_PREFIX_PATH="$HOME/deps" \ + -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \ -DTARGET_GLES2=$TARGET_GLES2 \ -DWITH_AUDIO=ON \ -DWITH_VK=OFF \ diff --git a/package/ci/unix-desktop-gles.sh b/package/ci/unix-desktop-gles.sh index 80f0d502f..e85b3888f 100755 --- a/package/ci/unix-desktop-gles.sh +++ b/package/ci/unix-desktop-gles.sh @@ -10,7 +10,7 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_BUILD_TYPE=Debug \ - -DWITH_INTERCONNECT=OFF \ + -DCORRADE_WITH_INTERCONNECT=OFF \ -G Ninja ninja install cd ../.. diff --git a/package/ci/unix-desktop-vulkan.sh b/package/ci/unix-desktop-vulkan.sh index 03840e8aa..0613579f4 100755 --- a/package/ci/unix-desktop-vulkan.sh +++ b/package/ci/unix-desktop-vulkan.sh @@ -10,9 +10,9 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_BUILD_TYPE=Debug \ - -DBUILD_DEPRECATED=$BUILD_DEPRECATED \ - -DWITH_INTERCONNECT=OFF \ - -DWITH_PLUGINMANAGER=ON \ + -DCORRADE_BUILD_DEPRECATED=$BUILD_DEPRECATED \ + -DCORRADE_WITH_INTERCONNECT=OFF \ + -DCORRADE_WITH_PLUGINMANAGER=ON \ -G Ninja ninja install cd ../.. diff --git a/package/ci/unix-desktop.sh b/package/ci/unix-desktop.sh index 93b27f0a9..49f0fa814 100755 --- a/package/ci/unix-desktop.sh +++ b/package/ci/unix-desktop.sh @@ -9,10 +9,10 @@ cmake .. \ -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS" \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ - -DBUILD_DEPRECATED=$BUILD_DEPRECATED \ - -DBUILD_STATIC=$BUILD_STATIC \ -DCMAKE_BUILD_TYPE=$CONFIGURATION \ - -DWITH_INTERCONNECT=OFF \ + -DCORRADE_BUILD_DEPRECATED=$BUILD_DEPRECATED \ + -DCORRADE_BUILD_STATIC=$BUILD_STATIC \ + -DCORRADE_WITH_INTERCONNECT=OFF \ -G Ninja ninja install cd ../..