additional ./configure option for wx-widgets cmakefile to fix wx-config bug with...
authordrowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Tue, 16 Jun 2015 00:45:15 +0000 (00:45 +0000)
committerdrowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Tue, 16 Jun 2015 00:45:15 +0000 (00:45 +0000)
git-svn-id: https://svn.code.sf.net/p/freetel/code@2194 01035d8c-6547-0410-b346-abe4f91aad63

fdmdv2-dev/cmake/BuildWxWidgets.cmake

index 7dbcd1e3c5b6e8684a9a706e323fa02a6e7abd68..82b6a02141128bf5847be359587b95685a2d75ff 100644 (file)
@@ -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()