From: drowe67 Date: Tue, 16 Jun 2015 00:45:15 +0000 (+0000) Subject: additional ./configure option for wx-widgets cmakefile to fix wx-config bug with... X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=f8b9a6fa0783900ebc056971be8110b8d0823da8;p=freetel-svn-tracking.git additional ./configure option for wx-widgets cmakefile to fix wx-config bug with suffix when doing win32 x-compile git-svn-id: https://svn.code.sf.net/p/freetel/code@2194 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/fdmdv2-dev/cmake/BuildWxWidgets.cmake b/fdmdv2-dev/cmake/BuildWxWidgets.cmake index 7dbcd1e3..82b6a021 100644 --- a/fdmdv2-dev/cmake/BuildWxWidgets.cmake +++ b/fdmdv2-dev/cmake/BuildWxWidgets.cmake @@ -15,7 +15,14 @@ if(MINGW AND NOT CMAKE_CROSSCOMPILING) # set(MAKE_COMMAND $(MAKE) -C build/msw -f makefile.gcc SHARED=0 UNICODE=1 BUILD=release PREFIX=${CMAKE_BINARY_DIR}/external/dist) set(CONFIGURE_COMMAND ./configure --disable-shared --prefix=${CMAKE_BINARY_DIR}/external/dist) set(MAKE_COMMAND $(MAKE)) -else() +endif() + +if(MINGW AND CMAKE_CROSSCOMPILING) + set(CONFIGURE_COMMAND ./configure --build=${HOST} --host=${HOST} --target=${HOST} --disable-shared --prefix=${CMAKE_BINARY_DIR}/external/dist) + set(MAKE_COMMAND $(MAKE)) +endif() + +if(NOT MINGW) set(CONFIGURE_COMMAND ./configure --host=${HOST} --target=${HOST} --disable-shared --prefix=${CMAKE_BINARY_DIR}/external/dist) set(MAKE_COMMAND $(MAKE)) endif()