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 68114038b83dd52a637a037a26a4221d3eeb6df6..7dbcd1e3c5b6e8684a9a706e323fa02a6e7abd68 100644 (file)
--- 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 68114038b83dd52a637a037a26a4221d3eeb6df6..7dbcd1e3c5b6e8684a9a706e323fa02a6e7abd68 100644 (file)
--- 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()