From: hobbes1069 <hobbes1069@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Thu, 13 Nov 2014 20:21:40 +0000 (+0000)
Subject: Attempt to fix linking of linsndfile to sox on windows builds.
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=89e8bd8c474df750a6f8d39437f41b1fa3e055b5;p=freetel-svn-tracking.git

Attempt to fix linking of linsndfile to sox on windows builds.

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

diff --git a/fdmdv2/cmake/BuildSndfile.cmake b/fdmdv2/cmake/BuildSndfile.cmake
index 5b949fd9..91df48ef 100644
--- a/fdmdv2/cmake/BuildSndfile.cmake
+++ b/fdmdv2/cmake/BuildSndfile.cmake
@@ -10,7 +10,7 @@ ExternalProject_Add(sndfile
     INSTALL_COMMAND $(MAKE) install
 )
 set(SNDFILE_LIBRARIES
-    ${CMAKE_BINARY_DIR}/external/dist/lib/libsndfile.a)
+    ${CMAKE_BINARY_DIR}/external/dist/lib/libsndfile.a PARENT_SCOPE)
 include_directories(${CMAKE_BINARY_DIR}/external/dist/include)
 list(APPEND FREEDV_LINK_LIBS ${SNDFILE_LIBRARIES})
 list(APPEND FREEDV_STATIC_DEPS sndfile)
diff --git a/fdmdv2/cmake/BuildSox.cmake b/fdmdv2/cmake/BuildSox.cmake
index 36d9c13f..206f6d72 100644
--- a/fdmdv2/cmake/BuildSox.cmake
+++ b/fdmdv2/cmake/BuildSox.cmake
@@ -40,4 +40,5 @@ list(APPEND FREEDV_STATIC_DEPS sox)
 
 if(USE_STATIC_SNDFILE)
     add_dependencies(sox sndfile)
+    list(APPEND FREEDV_LINK_LIBS ${SNDFILE_LIBRARIES})
 endif(USE_STATIC_SNDFILE)