me/portaudio
Watch
1
0
Fork
You've already forked portaudio
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

supply pkg-config version via setting in CMakeLists.txt - allow installation when using MinGW

Browse source
This commit is contained in:
Nicholas Appleton 2016-09-13 22:04:31 +10:00
commit 0fc163720c
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -37,6 +37,8 @@ IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_LIST_DIR})
ENDIF(WIN32 AND MSVC) ENDIF(WIN32 AND MSVC)
ENDIF() ENDIF()
SET(PA_PKGCONFIG_VERSION 19)
# Most of the code from this point onwards is related to populating the # Most of the code from this point onwards is related to populating the
# following variables: # following variables:
# PA_PUBLIC_INCLUDES - This contains the list of public PortAudio header # PA_PUBLIC_INCLUDES - This contains the list of public PortAudio header
@ -352,7 +354,7 @@ TARGET_INCLUDE_DIRECTORIES(portaudio_static PRIVATE ${PA_PRIVATE_INCLUDE_PATHS})
TARGET_INCLUDE_DIRECTORIES(portaudio_static PUBLIC include) TARGET_INCLUDE_DIRECTORIES(portaudio_static PUBLIC include)
TARGET_LINK_LIBRARIES(portaudio_static ${PA_LIBRARY_DEPENDENCIES}) TARGET_LINK_LIBRARIES(portaudio_static ${PA_LIBRARY_DEPENDENCIES})
IF(WIN32) IF(WIN32 AND MSVC)
OPTION(PA_CONFIG_LIB_OUTPUT_PATH "Make sure that output paths are kept neat" OFF) OPTION(PA_CONFIG_LIB_OUTPUT_PATH "Make sure that output paths are kept neat" OFF)
IF(CMAKE_CL_64) IF(CMAKE_CL_64)
SET(TARGET_POSTFIX x64) SET(TARGET_POSTFIX x64)

2
cmake_support/portaudio-2.0.pc.in
View file

@ -6,7 +6,7 @@ includedir=${prefix}/include
Name: PortAudio Name: PortAudio
Description: Portable audio I/O Description: Portable audio I/O
Requires: Requires:
Version: 19 Version: @PA_PKGCONFIG_VERSION@
Libs: -L${libdir} -lportaudio @PA_PKGCONFIG_LDFLAGS@ Libs: -L${libdir} -lportaudio @PA_PKGCONFIG_LDFLAGS@
Cflags: -I${includedir} @PA_PKGCONFIG_CFLAGS@ Cflags: -I${includedir} @PA_PKGCONFIG_CFLAGS@