Updated method of detecting dependencies for MinGW builds.

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

diff --git a/freedv-dev/CMakeLists.txt b/freedv-dev/CMakeLists.txt
index 023e565d8d464b89d53042c5ccab7a88dd0fb11a..666c5fa93ee92f6d37876a80ea168d9b2dacd7c5 100644 (file)
--- a/freedv-dev/CMakeLists.txt
+++ b/freedv-dev/CMakeLists.txt
@@ -28,7 +28,7 @@ project(FreeDV)
 # Set FreeDV version and generate src/version.h
 #
 set(FREEDV_VERSION_MAJOR 1)
-set(FREEDV_VERSION_MINOR 0)
+set(FREEDV_VERSION_MINOR 2)
 set(FREEDV_VERSION_PATCH FALSE)
 set(FREEDV_VERSION ${FREEDV_VERSION_MAJOR}.${FREEDV_VERSION_MINOR})
 if(FREEDV_VERSION_PATCH)

diff --git a/freedv-dev/cmake/GetDependencies.cmake.in b/freedv-dev/cmake/GetDependencies.cmake.in
index d1617e8fe04d8503839db21ae57a77ddf2d6add5..7470aa6d98a3d9a7fa6bffe94ef9b64a99ed28b6 100644 (file)
--- a/freedv-dev/cmake/GetDependencies.cmake.in
+++ b/freedv-dev/cmake/GetDependencies.cmake.in
@@ -18,16 +18,16 @@ foreach(_runtime ${_deps})
     message("Looking for ${_runtime}")
     find_library(RUNTIME_${_runtime} ${_runtime})
     message("${RUNTIME_${_runtime}}")
-    if("${_runtime}" MATCHES "^libgcc.*")
+    if(RUNTIME_${_runtime})
         message("Looking for dependencies of ${_runtime}")
         get_prerequisites("${RUNTIME_${_runtime}}" _deps2 1 0 "" "")
         foreach(_runtime2 ${_deps2})
-        find_library(RUNTIME_${_runtime2} ${_runtime2})
-        message("${RUNTIME_${_runtime2}}")
-        if(RUNTIME_${_runtime2})
-            file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"
-            TYPE EXECUTABLE FILES "${RUNTIME_${_runtime2}}")
-        endif()
+            find_library(RUNTIME_${_runtime2} ${_runtime2})
+            message("${RUNTIME_${_runtime2}}")
+            if(RUNTIME_${_runtime2})
+                file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"
+                TYPE EXECUTABLE FILES "${RUNTIME_${_runtime2}}")
+            endif()
         endforeach()
     endif()
     if(RUNTIME_${_runtime})