From b2c6221eb45ee3f6d5f036af15abdd975c43d6f0 Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Sun, 6 Oct 2019 18:03:29 +0300 Subject: [PATCH] - better CMake --- platform_libs.cmake | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/platform_libs.cmake b/platform_libs.cmake index 3a70712..c1baca0 100644 --- a/platform_libs.cmake +++ b/platform_libs.cmake @@ -10,18 +10,19 @@ if (CMAKE_SYSTEM MATCHES "Linux*") # uuid set (UUID_LIB ${CMAKE_CURRENT_LIST_DIR}/uuid/lib/lin64/libuuid.a) -<<<<<<< Updated upstream set (UUID_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/uuid/include) # event2 set (EVENT2_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/event2/include) - set (EVENT2_LIB ${CMAKE_CURRENT_LIST_DIR}/event2/lib/linux/x64/libevent.a) - set (EVENT2_LIB_CORE ${CMAKE_CURRENT_LIST_DIR}/event2/lib/linux/x64/libevent_core.a) - set (EVENT2_LIB_EXTRA ${CMAKE_CURRENT_LIST_DIR}/event2/lib/linux/x64/libevent_extra.a) - set (EVENT2_LIB_PTHREADS ${CMAKE_CURRENT_LIST_DIR}/event2/lib/linux/x64/libevent_pthreads.a) - set (EVENT2_LIB_OPENSSL ${CMAKE_CURRENT_LIST_DIR}/event2/lib/linux/x64/libevent_openssl.a) + set (EVENT2_LIB ${CMAKE_CURRENT_LIST_DIR}/event2/linux/x64/libevent.a) + set (EVENT2_LIB_CORE ${CMAKE_CURRENT_LIST_DIR}/event2/linux/x64/libevent_core.a) + set (EVENT2_LIB_EXTRA ${CMAKE_CURRENT_LIST_DIR}/event2/linux/x64/libevent_extra.a) + set (EVENT2_LIB_PTHREADS ${CMAKE_CURRENT_LIST_DIR}/event2/linux/x64/libevent_pthreads.a) + set (EVENT2_LIB_OPENSSL ${CMAKE_CURRENT_LIST_DIR}/event2/linux/x64/libevent_openssl.a) endif() +set (EVENT2_LIBS ${EVENT2_LIB} ${EVENT2_LIB_CORE} ${EVENT2_LIB_EXTRA} ${EVENT2_LIB_PTHREADS}) + if (CMAKE_SYSTEM MATCHES "Windows*") set (SNDFILE_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/sndfile/include) set (SNDFILE_LIBS ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/flac.lib @@ -31,14 +32,12 @@ if (CMAKE_SYSTEM MATCHES "Windows*") ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbis.lib ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbisfile.lib ${CMAKE_CURRENT_LIST_DIR}/sndfile/win32/static/vorbisenc.lib) -======= - - # Opus - set (OPUS_LIB ${CMAKE_CURRENT_LIST_DIR}/opus/linux/libopus.a) - set (OPUS_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/opus/include) - - # Portaudio - set (PORTAUDIO_LIB ${CMAKE_CURRENT_LIST_DIR}/portaudio/linux/x64/libportaudio.a) - set (PORTAUDIO_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/portaudio/include) ->>>>>>> Stashed changes endif() + +# Opus +set (OPUS_LIB ${CMAKE_CURRENT_LIST_DIR}/opus/linux/libopus.a) +set (OPUS_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/opus/include) + +# Portaudio +set (PORTAUDIO_LIB ${CMAKE_CURRENT_LIST_DIR}/portaudio/linux/x64/libportaudio.a) +set (PORTAUDIO_INCLUDE ${CMAKE_CURRENT_LIST_DIR}/portaudio/include)