Consolidate CMake options

Author: triplef

phases/11-libobjc2.sh

@@ -20,7 +20,6 @@ cd build-${ABI_NAME}
 
 ${CMAKE} .. \
   ${CMAKE_OPTIONS} \
-  -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
   -DGNUSTEP_CONFIG= `# prevent cmake from finding gnustep-config in install root` \
   -DOLDABI_COMPAT=false `# we're using gnustep-2.0 ABI, which may not be mixed with earlier versions'` \
 

phases/12-libdispatch.sh

@@ -20,7 +20,6 @@ cd build-${ABI_NAME}
 
 ${CMAKE} .. \
   ${CMAKE_OPTIONS} \
-  -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
   -DBUILD_SHARED_LIBS=YES \
   -DINSTALL_PRIVATE_HEADERS=YES \
   `# use blocks runtime from libobjc2 with libdispatch-own-blocksruntime.patch` \

scripts/toolchain.sh

@@ -58,6 +58,7 @@ export LIBS="-lc++_shared"
 # common options for CMake-based projects
 # CMAKE_FIND_USE_CMAKE_PATH=false fixes finding incorrect libraries in $TOOLCHAIN/lib[64] instead of $TOOLCHAIN/sysroot/usr/lib/$ANDROID_TARGET, e.g. for libc++abi.a for libobjc2.
 CMAKE_OPTIONS=" \
+  -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
   -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} \
   -DCMAKE_FIND_USE_CMAKE_PATH=false \