From c2cbac413feb8ee3bac30970c67a5851d1637e2b Mon Sep 17 00:00:00 2001 From: hobbes1069 Date: Tue, 14 Feb 2017 16:37:33 +0000 Subject: [PATCH] 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 --- freedv-dev/CMakeLists.txt | 2 +- freedv-dev/cmake/GetDependencies.cmake.in | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/freedv-dev/CMakeLists.txt b/freedv-dev/CMakeLists.txt index 023e565d..666c5fa9 100644 --- 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 d1617e8f..7470aa6d 100644 --- 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}) -- 2.25.1