diff --git a/CMakeLists.txt b/CMakeLists.txt index 0071872d..9bc56be2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,11 @@ # cmake_minimum_required(VERSION 3.13) +# Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24. +if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0") + cmake_policy(SET CMP0135 NEW) +endif() + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "Minimum OS X deployment version") set(PROJECT_NAME FreeDV) diff --git a/cmake/BuildCodec2.cmake b/cmake/BuildCodec2.cmake index 73e4fda6..20c080ee 100644 --- a/cmake/BuildCodec2.cmake +++ b/cmake/BuildCodec2.cmake @@ -27,10 +27,12 @@ ExternalProject_Add(build_codec2 ExternalProject_Get_Property(build_codec2 BINARY_DIR) ExternalProject_Get_Property(build_codec2 SOURCE_DIR) add_library(codec2 SHARED IMPORTED) + set_target_properties(codec2 PROPERTIES IMPORTED_LOCATION "${BINARY_DIR}/src/libcodec2${CMAKE_SHARED_LIBRARY_SUFFIX}" IMPORTED_IMPLIB "${BINARY_DIR}/src/libcodec2${CMAKE_IMPORT_LIBRARY_SUFFIX}" ) + add_dependencies(build_codec2 build_lpcnetfreedv) include_directories(${CMAKE_BINARY_DIR}/codec2_src/src ${CMAKE_BINARY_DIR}/codec2_build) diff --git a/cmake/BuildLPCNet.cmake b/cmake/BuildLPCNet.cmake index 5d4c33d1..20116618 100644 --- a/cmake/BuildLPCNet.cmake +++ b/cmake/BuildLPCNet.cmake @@ -20,8 +20,10 @@ ExternalProject_Add(build_lpcnetfreedv ExternalProject_Get_Property(build_lpcnetfreedv BINARY_DIR) ExternalProject_Get_Property(build_lpcnetfreedv SOURCE_DIR) add_library(lpcnetfreedv SHARED IMPORTED) + set_target_properties(lpcnetfreedv PROPERTIES IMPORTED_LOCATION "${BINARY_DIR}/src/liblpcnetfreedv${CMAKE_SHARED_LIBRARY_SUFFIX}" IMPORTED_IMPLIB "${BINARY_DIR}/src/liblpcnetfreedv${CMAKE_IMPORT_LIBRARY_SUFFIX}" ) -include_directories(${SOURCE_DIR}/src) + +include_directories(${SOURCE_DIR}/src) \ No newline at end of file diff --git a/cmake/BuildSndfile.cmake b/cmake/BuildSndfile.cmake index 827989e4..3cfbcfec 100644 --- a/cmake/BuildSndfile.cmake +++ b/cmake/BuildSndfile.cmake @@ -1,15 +1,15 @@ set(SNDFILE_TARBALL "libsndfile-1.0.28") if(MINGW AND CMAKE_CROSSCOMPILING) - set(CONFIGURE_COMMAND ./configure --host=${HOST} --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-external-libs --disable-shared --disable-sqlite) + set(CONFIGURE_COMMAND autoreconf -i && ./configure --host=${HOST} --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-external-libs --disable-shared --disable-sqlite) elseif(APPLE) if(BUILD_OSX_UNIVERSAL) - set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-shared --disable-external-libs CFLAGS=-g\ -O2\ -mmacosx-version-min=10.9\ -arch\ x86_64\ -arch\ arm64 LDFLAGS=-arch\ x86_64\ -arch\ arm64) + set(CONFIGURE_COMMAND autoreconf -i && ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-shared --disable-external-libs CFLAGS=-g\ -O2\ -mmacosx-version-min=10.9\ -arch\ x86_64\ -arch\ arm64 LDFLAGS=-arch\ x86_64\ -arch\ arm64) else() - set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-shared --disable-external-libs CFLAGS=-g\ -O2\ -mmacosx-version-min=10.9) + set(CONFIGURE_COMMAND autoreconf -i && ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-shared --disable-external-libs CFLAGS=-g\ -O2\ -mmacosx-version-min=10.9) endif(BUILD_OSX_UNIVERSAL) else() - set(CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-external-libs --disable-shared --disable-external-libs) + set(CONFIGURE_COMMAND autoreconf -i && ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist --disable-external-libs --disable-shared --disable-external-libs) endif() include(ExternalProject) diff --git a/cmake/Buildportaudio-2.0.cmake b/cmake/Buildportaudio-2.0.cmake index bfcfa9e3..3c32191b 100644 --- a/cmake/Buildportaudio-2.0.cmake +++ b/cmake/Buildportaudio-2.0.cmake @@ -1,4 +1,4 @@ -set(BUILD_SHARED_LIBS OFF CACHE STRING "Disable shared libraries for portaudio") +#set(BUILD_SHARED_LIBS OFF CACHE STRING "Disable shared libraries for portaudio") include(FetchContent) FetchContent_Declare(