Fix MXE builds

cmake/CopyResources.cmake

@@ -15,7 +15,7 @@ MACRO(ADD_QGIS_RESOURCES SOURCE_PREFIX TARGET_PREFIX DEST_FILES SOURCE_FILE_PATH
 FOREACH(RESOURCE_FILE ${SOURCE_FILE_PATHS})
   ADD_CUSTOM_COMMAND(
           OUTPUT "${CMAKE_BINARY_DIR}/output/data/${TARGET_PREFIX}/${RESOURCE_FILE}"
-    COMMAND cmake -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy
       "${SOURCE_PREFIX}/${RESOURCE_FILE}"
       "${CMAKE_BINARY_DIR}/output/data/${TARGET_PREFIX}/${RESOURCE_FILE}"
     DEPENDS "${SOURCE_PREFIX}/${RESOURCE_FILE}"

ms-windows/mxe/build-mxe.sh

@@ -81,6 +81,7 @@ if [[ "$COMMAND" != *"package"* ]]; then
         -DWITH_SERVER=OFF \
         -DWITH_BINDINGS=FALSE \
         -DQT_LRELEASE_EXECUTABLE=${MXE}/usr/${TARGET}/qt5/bin/lrelease \
+	-DMXE=ON \
         $ARGS
 
     make -j16 install

resources/CMakeLists.txt

@@ -53,7 +53,7 @@ ENDIF (PROJ_VERSION_MAJOR GREATER 5)
 
 ADD_CUSTOM_COMMAND(
   OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/srs.db"
-  COMMAND cmake -E copy
+  COMMAND ${CMAKE_COMMAND} -E copy
     "${CMAKE_CURRENT_SOURCE_DIR}/${SRSDB}"
     "${CMAKE_CURRENT_BINARY_DIR}/srs.db"
   DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${SRSDB}"

src/crssync/CMakeLists.txt

@@ -22,7 +22,7 @@ IF(MSVC AND NOT USING_NMAKE)
 		COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/crssync.exe
 		DEPENDS crssync
 	)
-ELSEIF(CMAKE_CROSSCOMPILING)
+ELSEIF(CMAKE_CROSSCOMPILING AND NOT MXE)
   SET(NATIVE_CRSSYNC_BIN CACHE PATH "Path to a natively compiled synccrsdb binary")
   IF(NOT NATIVE_CRSSYNC_BIN)
     MESSAGE(FATAL_ERROR "NATIVE_CRSSYNC_BIN needs to be defined when cross-compiling")