From 28bcc0a95277ce4b68de862999cb0a5a360ec9ab Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 23 Feb 2015 08:43:18 -0800 Subject: [PATCH] use nmake on win for QXmpp build --- cmake/externals/qxmpp/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmake/externals/qxmpp/CMakeLists.txt b/cmake/externals/qxmpp/CMakeLists.txt index ddac75569b..e605e2b253 100644 --- a/cmake/externals/qxmpp/CMakeLists.txt +++ b/cmake/externals/qxmpp/CMakeLists.txt @@ -11,6 +11,12 @@ if (ANDROID) set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19") endif () +if (WIN32) + find_program(PLATFORM_BUILD_COMMAND NAME nmake) +else () + find_program(PLATFORM_BUILD_COMMAND NAME make) +endif () + include(ExternalProject) ExternalProject_Add( ${EXTERNAL_NAME} @@ -19,6 +25,7 @@ ExternalProject_Add( BUILD_IN_SOURCE 1 PATCH_COMMAND patch -p2 -t -N --verbose < ${CMAKE_CURRENT_SOURCE_DIR}/qxmpp.patch CONFIGURE_COMMAND ${QMAKE_COMMAND} PREFIX= + BUILD_COMMAND PLATFORM_BUILD_COMMAND LOG_DOWNLOAD 1 LOG_CONFIGURE 1 LOG_BUILD 1