From: hobbes1069 Date: Thu, 24 Sep 2015 19:48:16 +0000 (+0000) Subject: Fix BuildCodec2.cmake and add cmake module to build hamlib (not ready for production). X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=807fc96a5a8bed8c13b9d29ff7b78faf152f5f7a;p=freetel-svn-tracking.git Fix BuildCodec2.cmake and add cmake module to build hamlib (not ready for production). git-svn-id: https://svn.code.sf.net/p/freetel/code@2377 01035d8c-6547-0410-b346-abe4f91aad63 --- diff --git a/freedv-dev/cmake/BuildCodec2.cmake b/freedv-dev/cmake/BuildCodec2.cmake index c29d1243..588b3161 100644 --- a/freedv-dev/cmake/BuildCodec2.cmake +++ b/freedv-dev/cmake/BuildCodec2.cmake @@ -6,10 +6,10 @@ if(USE_STATIC_SPEEXDSP) -DSPEEXDSP_INCLUDE_DIR=${CMAKE_BINARY_DIR}/external/dist/include) endif() -set(CODEC2_CMAKE_ARGS "-DUNITTEST=FALSE") +set(CODEC2_CMAKE_ARGS -DUNITTEST=FALSE) if(CMAKE_CROSSCOMPILING) - set(CODEC2_CMAKE_ARGS "${CODEC2_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}") + set(CODEC2_CMAKE_ARGS ${CODEC2_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}) endif() include(ExternalProject) diff --git a/freedv-dev/cmake/BuildHamlib.cmake b/freedv-dev/cmake/BuildHamlib.cmake new file mode 100644 index 00000000..4166f5ae --- /dev/null +++ b/freedv-dev/cmake/BuildHamlib.cmake @@ -0,0 +1,20 @@ +set(HAMLIB_TARBALL "hamlib-1.2.15.3") + +include(ExternalProject) +ExternalProject_Add(hamlib + URL http://downloads.sourceforge.net/hamlib/${HAMLIB_TARBALL}.tar.gz + BUILD_IN_SOURCE 1 + INSTALL_DIR external/dist + CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/external/dist + BUILD_COMMAND $(MAKE) + INSTALL_COMMAND $(MAKE) install +) +if(WIN32) + set(HAMLIB_LIBRARIES ${CMAKE_BINARY_DIR}/external/dist/lib/portaudio.lib) +else(WIN32) + set(HAMLIB_LIBRARIES + ) +endif(WIN32) +include_directories(${CMAKE_BINARY_DIR}/external/dist/include) +list(APPEND FREEDV_LINK_LIBS ${HAMLIB_LIBRARIES}) +list(APPEND FREEDV_STATIC_DEPS hamlib)