VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-30 20:40:20 -04:00
Code Issues Projects Releases Wiki Activity

Add dependency on pthreads project for DAB project on windows

Browse Source
This commit is contained in:
Jon Beniston 2021-04-23 14:02:40 +01:00
parent 6bc925ebab
commit b72275b1d3
1 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
external/CMakeLists.txt vendored
View File

@ -451,10 +451,25 @@ if (ZLIB_FOUND AND FAAD_FOUND)
set(DAB_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libdab_lib${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") set(DAB_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libdab_lib${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
endif() endif()
if (WIN32) if (WIN32)
set(PTHREADS_OPT_FOR_DAB "-DPTHREADS=${PTHREADS4W_LIBRARIES}" CACHE INTERNAL "") ExternalProject_Add(dab
else() GIT_REPOSITORY https://github.com/srcejon/dab-cmdline.git
set(PTHREADS_OPT_FOR_DAB "" CACHE INTERNAL "") GIT_TAG msvc
endif() DEPENDS ${PTHREADS4W_DEPENDS}
PREFIX "${EXTERNAL_BUILD_LIBRARIES}/dab"
SOURCE_SUBDIR "library"
CMAKE_ARGS ${COMMON_CMAKE_ARGS}
-DFFTW3F_INCLUDE_DIRS=${FFTW3F_INCLUDE_DIRS}
-DFFTW3F_LIBRARIES=${FFTW3F_LIBRARIES}
-DFAAD_INCLUDE_DIR=${FAAD_INCLUDE_DIR}
-DFAAD_LIBRARY=${FAAD_LIBRARY}
-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS}
-DZLIB_LIBRARY=${ZLIB_LIBRARIES}
-DPTHREADS=${PTHREADS4W_LIBRARIES}
BUILD_BYPRODUCTS "${DAB_LIBRARIES}"
INSTALL_COMMAND ""
TEST_COMMAND ""
)
else(WIN32)
ExternalProject_Add(dab ExternalProject_Add(dab
GIT_REPOSITORY https://github.com/srcejon/dab-cmdline.git GIT_REPOSITORY https://github.com/srcejon/dab-cmdline.git
GIT_TAG msvc GIT_TAG msvc
@ -467,11 +482,11 @@ if (ZLIB_FOUND AND FAAD_FOUND)
-DFAAD_LIBRARY=${FAAD_LIBRARY} -DFAAD_LIBRARY=${FAAD_LIBRARY}
-DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS} -DZLIB_INCLUDE_DIR=${ZLIB_INCLUDE_DIRS}
-DZLIB_LIBRARY=${ZLIB_LIBRARIES} -DZLIB_LIBRARY=${ZLIB_LIBRARIES}
${PTHREADS_OPT_FOR_DAB}
BUILD_BYPRODUCTS "${DAB_LIBRARIES}" BUILD_BYPRODUCTS "${DAB_LIBRARIES}"
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""
) )
endif(WIN32)
ExternalProject_Get_Property(dab source_dir binary_dir) ExternalProject_Get_Property(dab source_dir binary_dir)
set(DAB_FOUND ON CACHE INTERNAL "") set(DAB_FOUND ON CACHE INTERNAL "")
set(DAB_EXTERNAL ON CACHE INTERNAL "") set(DAB_EXTERNAL ON CACHE INTERNAL "")