diff --git a/doc/building.dox b/doc/building.dox index 1d9e5cd2a..c454b6e00 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -462,7 +462,6 @@ in `CMAKE_PREFIX_PATH`. mkdir build-nacl-x86-32 && cd build-nacl-x86-32 cmake .. \ - -DCMAKE_MODULE_PATH="/absolute/path/to/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/NaCl-newlib-x86-32.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=/usr/nacl \ @@ -473,7 +472,6 @@ in `CMAKE_PREFIX_PATH`. mkdir build-nacl-x86-64 && cd build-nacl-x86-64 cmake .. \ - -DCMAKE_MODULE_PATH="/absolute/path/to/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/NaCl-newlib-x86-64.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=/usr/nacl \ @@ -512,7 +510,6 @@ equivalent) by disabling `TARGET_GLES2`. mkdir build-emscripten && cd build-emscripten cmake .. \ - -DCMAKE_MODULE_PATH="/absolute/path/to/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Emscripten.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=/usr/lib/emscripten/system \ @@ -551,7 +548,6 @@ enabled by default, switch to 3.0 by disabling `TARGET_GLES2`. mkdir build-ios && cd build-ios cmake .. \ - -DCMAKE_MODULE_PATH=/absolute/path/to/toolchains/modules/ \ -DCMAKE_TOOLCHAIN_FILE=../toolchains/generic/iOS.cmake \ -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk \ -DCMAKE_OSX_ARCHITECTURES="arm64;armv7;armv7s" \ @@ -590,7 +586,6 @@ built for OpenGL ES 2.0 by default, switch to 3.0 by disabling `TARGET_GLES2`. mkdir build-android-arm && cd build-android-arm cmake .. \ - -DCMAKE_MODULE_PATH="/absolute/path/to/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Android-ARM.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=/opt/android-ndk/platforms/android-19/arch-arm/usr \ @@ -601,7 +596,6 @@ built for OpenGL ES 2.0 by default, switch to 3.0 by disabling `TARGET_GLES2`. mkdir build-android-x86 && cd build-android-x86 cmake .. \ - -DCMAKE_MODULE_PATH="/absolute/path/to/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Android-x86.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=/opt/android-ndk/platforms/android-19/arch-x86/usr \ diff --git a/package/archlinux/PKGBUILD-android-arm b/package/archlinux/PKGBUILD-android-arm index 272043844..01b7a6154 100644 --- a/package/archlinux/PKGBUILD-android-arm +++ b/package/archlinux/PKGBUILD-android-arm @@ -18,7 +18,6 @@ build() { cd "$_rootdir/build-android-arm" cmake .. \ - -DCMAKE_MODULE_PATH="$_rootdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/Android-ARM.cmake" \ -DTARGET_GLES=ON \ -DTARGET_GLES2=ON \ diff --git a/package/archlinux/PKGBUILD-android-x86 b/package/archlinux/PKGBUILD-android-x86 index d8225212a..5862419ef 100644 --- a/package/archlinux/PKGBUILD-android-x86 +++ b/package/archlinux/PKGBUILD-android-x86 @@ -18,7 +18,6 @@ build() { cd "$_rootdir/build-android-x86" cmake .. \ - -DCMAKE_MODULE_PATH="$_rootdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/Android-x86.cmake" \ -DTARGET_GLES=ON \ -DTARGET_GLES2=ON \ diff --git a/package/archlinux/PKGBUILD-emscripten b/package/archlinux/PKGBUILD-emscripten index ba6c218bc..12445e06c 100644 --- a/package/archlinux/PKGBUILD-emscripten +++ b/package/archlinux/PKGBUILD-emscripten @@ -18,7 +18,6 @@ build() { cd "$_rootdir/build-emscripten" cmake .. \ - -DCMAKE_MODULE_PATH="$_rootdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/Emscripten.cmake" \ -DCMAKE_PREFIX_PATH=/usr/lib/emscripten/system fi diff --git a/package/archlinux/PKGBUILD-emscripten-webgl2 b/package/archlinux/PKGBUILD-emscripten-webgl2 index 2ccc843ed..5025f842d 100644 --- a/package/archlinux/PKGBUILD-emscripten-webgl2 +++ b/package/archlinux/PKGBUILD-emscripten-webgl2 @@ -18,7 +18,6 @@ build() { cd "$_rootdir/build-emscripten-webgl2" cmake .. \ - -DCMAKE_MODULE_PATH="$_rootdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/Emscripten.cmake" \ -DCMAKE_PREFIX_PATH=/usr/lib/emscripten/system fi diff --git a/package/archlinux/PKGBUILD-nacl-glibc b/package/archlinux/PKGBUILD-nacl-glibc index 16f035e9c..045c4387d 100644 --- a/package/archlinux/PKGBUILD-nacl-glibc +++ b/package/archlinux/PKGBUILD-nacl-glibc @@ -18,7 +18,6 @@ build() { cd "$_rootdir/build-nacl-glibc-x86-32" cmake .. \ - -DCMAKE_MODULE_PATH="$_rootdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/NaCl-glibc-x86-32.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/nacl \ @@ -39,7 +38,6 @@ build() { cd "$_rootdir/build-nacl-glibc-x86-64" cmake .. \ - -DCMAKE_MODULE_PATH="$_rootdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/NaCl-glibc-x86-64.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/nacl \ diff --git a/package/archlinux/PKGBUILD-nacl-newlib b/package/archlinux/PKGBUILD-nacl-newlib index 1821e61f0..58acf01a3 100644 --- a/package/archlinux/PKGBUILD-nacl-newlib +++ b/package/archlinux/PKGBUILD-nacl-newlib @@ -18,7 +18,6 @@ build() { cd "$_rootdir/build-nacl-newlib-x86-32" cmake .. \ - -DCMAKE_MODULE_PATH="$_rootdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/NaCl-newlib-x86-32.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/nacl \ @@ -40,7 +39,6 @@ build() { cd "$_rootdir/build-nacl-newlib-x86-64" cmake .. \ - -DCMAKE_MODULE_PATH="$_rootdir/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="$_rootdir/toolchains/generic/NaCl-newlib-x86-64.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/nacl \ diff --git a/package/ci/jenkins-android.xml b/package/ci/jenkins-android.xml index 1194044d1..845e228a4 100644 --- a/package/ci/jenkins-android.xml +++ b/package/ci/jenkins-android.xml @@ -85,7 +85,6 @@ cd build-android-${gl}-${toolchain}-${compatibility} cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_MODULE_PATH="${WORKSPACE}/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE=../toolchains/generic/Android-${toolchain}.cmake \ -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/android-${toolchain}-${compatibility} \ -DCMAKE_PREFIX_PATH=${JENKINS_HOME}/filesystem/android-${toolchain}-${compatibility} \ diff --git a/package/ci/jenkins-emscripten.xml b/package/ci/jenkins-emscripten.xml index 916941224..aa9aa6317 100644 --- a/package/ci/jenkins-emscripten.xml +++ b/package/ci/jenkins-emscripten.xml @@ -78,7 +78,6 @@ cd build-emscripten-${compatibility}-${gl} cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_MODULE_PATH="${WORKSPACE}/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Emscripten.cmake" \ -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/emscripten-${compatibility} \ -DCMAKE_PREFIX_PATH=${JENKINS_HOME}/filesystem/emscripten-${compatibility} \ diff --git a/package/ci/jenkins-nacl.xml b/package/ci/jenkins-nacl.xml index 2cccbe67b..16f970324 100644 --- a/package/ci/jenkins-nacl.xml +++ b/package/ci/jenkins-nacl.xml @@ -72,7 +72,6 @@ cd build-nacl-${toolchain}-${compatibility} cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_MODULE_PATH="${WORKSPACE}/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE=../toolchains/generic/NaCl-${toolchain}.cmake \ -DCMAKE_FIND_ROOT_PATH=${JENKINS_HOME}/filesystem/nacl-${toolchain}-${compatibility} \ -DCMAKE_INSTALL_PREFIX=${JENKINS_HOME}/filesystem/nacl-${toolchain}-${compatibility} \ diff --git a/src/Magnum/Platform/AndroidApplication.h b/src/Magnum/Platform/AndroidApplication.h index 0927d1956..5a9b5c39e 100644 --- a/src/Magnum/Platform/AndroidApplication.h +++ b/src/Magnum/Platform/AndroidApplication.h @@ -87,15 +87,11 @@ properly set **absolute** path to `toolchains/modules/` directory containing `Platform/Android.cmake`. mkdir build-android-arm && cd build-android-arm - cmake .. \ - -DCMAKE_MODULE_PATH="/absolute/path/to/toolchains/modules" \ - -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Android-ARM.cmake" + cmake .. -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Android-ARM.cmake" cmake --build . mkdir build-android-x86 && cd build-android-x86 - cmake .. \ - -DCMAKE_MODULE_PATH="/absolute/path/to/toolchains/modules" \ - -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Android-x86.cmake" + cmake .. -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Android-x86.cmake" cmake --build . See @ref cmake for more information. diff --git a/src/Magnum/Platform/NaClApplication.h b/src/Magnum/Platform/NaClApplication.h index 352c8f2de..488b4e742 100644 --- a/src/Magnum/Platform/NaClApplication.h +++ b/src/Magnum/Platform/NaClApplication.h @@ -96,7 +96,6 @@ location of your webserver to have the files installed in proper location (e.g. mkdir build-nacl-x86-32 && cd build-nacl-x86-32 cmake .. \ - -DCMAKE_MODULE_PATH="/absolute/path/to/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/NaCl-newlib-x86-32.cmake" \ -DCMAKE_INSTALL_PREFIX=/srv/http/nacl cmake --build . @@ -104,7 +103,6 @@ location of your webserver to have the files installed in proper location (e.g. mkdir build-nacl-x86-64 && cd build-nacl-x86-64 cmake .. \ - -DCMAKE_MODULE_PATH="/absolute/path/to/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/NaCl-newlib-x86-64.cmake" \ -DCMAKE_INSTALL_PREFIX=/srv/http/nacl cmake --build . diff --git a/src/Magnum/Platform/Sdl2Application.h b/src/Magnum/Platform/Sdl2Application.h index 7f39f7086..0086aafa2 100644 --- a/src/Magnum/Platform/Sdl2Application.h +++ b/src/Magnum/Platform/Sdl2Application.h @@ -101,7 +101,6 @@ webserver, e.g. `/srv/http/emscripten`). mkdir build-emscripten && cd build-emscripten cmake .. \ - -DCMAKE_MODULE_PATH="/absolute/path/to/toolchains/modules" \ -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Emscripten.cmake" -DCMAKE_INSTALL_PREFIX=/srv/http/emscripten cmake --build . @@ -131,7 +130,6 @@ you have all the dependencies. mkdir build-ios && cd build-ios cmake .. \ - -DCMAKE_MODULE_PATH=/absolute/path/to/toolchains/modules/ \ -DCMAKE_TOOLCHAIN_FILE=../toolchains/generic/iOS.cmake \ -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk \ -DCMAKE_OSX_ARCHITECTURES="arm64;armv7;armv7s" \