From: hobbes1069 <hobbes1069@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Sat, 13 Jun 2015 14:47:34 +0000 (+0000)
Subject: Allow alterante wx-config to be specified when bootstrapping wxWidgets.
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=8651503db50c22aae770d20f28ba3a2596706c66;p=freetel-svn-tracking.git

Allow alterante wx-config to be specified when bootstrapping wxWidgets.

git-svn-id: https://svn.code.sf.net/p/freetel/code@2187 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/fdmdv2-dev/cmake/BuildWxWidgets.cmake b/fdmdv2-dev/cmake/BuildWxWidgets.cmake
index 68114038..7dbcd1e3 100644
--- a/fdmdv2-dev/cmake/BuildWxWidgets.cmake
+++ b/fdmdv2-dev/cmake/BuildWxWidgets.cmake
@@ -32,7 +32,9 @@ ExternalProject_Add(wxWidgets
 
 ExternalProject_Get_Property(wxWidgets install_dir)
 message(STATUS "wxWidgets install dir: ${install_dir}")
-set(WXCONFIG "${install_dir}/bin/wx-config")
+if(NOT WXCONFIG)
+    set(WXCONFIG "${install_dir}/bin/wx-config")
+endif()
 if(EXISTS ${WXCONFIG})
     set(BS_WX_DONE TRUE)
 endif()
diff --git a/fdmdv2/cmake/BuildWxWidgets.cmake b/fdmdv2/cmake/BuildWxWidgets.cmake
index 68114038..7dbcd1e3 100644
--- a/fdmdv2/cmake/BuildWxWidgets.cmake
+++ b/fdmdv2/cmake/BuildWxWidgets.cmake
@@ -32,7 +32,9 @@ ExternalProject_Add(wxWidgets
 
 ExternalProject_Get_Property(wxWidgets install_dir)
 message(STATUS "wxWidgets install dir: ${install_dir}")
-set(WXCONFIG "${install_dir}/bin/wx-config")
+if(NOT WXCONFIG)
+    set(WXCONFIG "${install_dir}/bin/wx-config")
+endif()
 if(EXISTS ${WXCONFIG})
     set(BS_WX_DONE TRUE)
 endif()