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 5b949fd9dcc5482a915dfdfedd39f02411f93473..91df48efde76f3700169e2dd30056b7a5db2a9a3 100644 (file)
--- 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 36d9c13f21cd3d574be03229ed968de7d8571024..206f6d724304044267e020a3ac0086cd97f17a33 100644 (file)
--- 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)