rename cmake_support directory to cmake
This commit is contained in:
parent
f9823ddf94
commit
03de31972c
10 changed files with 8 additions and 8 deletions
2
.github/workflows/cmake.yml
vendored
2
.github/workflows/cmake.yml
vendored
|
|
@ -19,7 +19,7 @@ jobs:
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
install_dir: ~/portaudio
|
install_dir: ~/portaudio
|
||||||
dependencies_extras: mingw-w64
|
dependencies_extras: mingw-w64
|
||||||
cmake_extras: -DCMAKE_TOOLCHAIN_FILE=i686-w64-mingw32.cmake
|
cmake_extras: -DCMAKE_TOOLCHAIN_FILE=cmake/i686-w64-mingw32.cmake
|
||||||
- name: Windows
|
- name: Windows
|
||||||
os: windows-latest
|
os: windows-latest
|
||||||
install_dir: C:\portaudio
|
install_dir: C:\portaudio
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ SOURCE_GROUP("common" FILES ${PA_COMMON_INCLUDES} ${PA_COMMON_SOURCES})
|
||||||
|
|
||||||
SET(PA_PUBLIC_INCLUDES include/portaudio.h)
|
SET(PA_PUBLIC_INCLUDES include/portaudio.h)
|
||||||
|
|
||||||
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake_support)
|
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
|
||||||
|
|
||||||
SET(PA_SKELETON_SOURCES src/hostapi/skeleton/pa_hostapi_skeleton.c)
|
SET(PA_SKELETON_SOURCES src/hostapi/skeleton/pa_hostapi_skeleton.c)
|
||||||
SOURCE_GROUP("hostapi\\skeleton" ${PA_SKELETON_SOURCES})
|
SOURCE_GROUP("hostapi\\skeleton" ${PA_SKELETON_SOURCES})
|
||||||
|
|
@ -230,8 +230,8 @@ IF(WIN32)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
SET(GENERATED_MESSAGE "CMake generated file, do NOT edit! Use CMake-GUI to change configuration instead.")
|
SET(GENERATED_MESSAGE "CMake generated file, do NOT edit! Use CMake-GUI to change configuration instead.")
|
||||||
CONFIGURE_FILE(cmake_support/template_portaudio.def ${CMAKE_CURRENT_BINARY_DIR}/portaudio_cmake.def @ONLY)
|
CONFIGURE_FILE(cmake/template_portaudio.def ${CMAKE_CURRENT_BINARY_DIR}/portaudio_cmake.def @ONLY)
|
||||||
CONFIGURE_FILE(cmake_support/options_cmake.h.in ${CMAKE_CURRENT_BINARY_DIR}/options_cmake.h @ONLY)
|
CONFIGURE_FILE(cmake/options_cmake.h.in ${CMAKE_CURRENT_BINARY_DIR}/options_cmake.h @ONLY)
|
||||||
SET(PA_PRIVATE_INCLUDES ${PA_PRIVATE_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}/options_cmake.h)
|
SET(PA_PRIVATE_INCLUDES ${PA_PRIVATE_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}/options_cmake.h)
|
||||||
SET(PA_PRIVATE_COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS} PORTAUDIO_CMAKE_GENERATED)
|
SET(PA_PRIVATE_COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS} PORTAUDIO_CMAKE_GENERATED)
|
||||||
SOURCE_GROUP("cmake_generated" FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio_cmake.def ${CMAKE_CURRENT_BINARY_DIR}/options_cmake.h)
|
SOURCE_GROUP("cmake_generated" FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio_cmake.def ${CMAKE_CURRENT_BINARY_DIR}/options_cmake.h)
|
||||||
|
|
@ -443,13 +443,13 @@ OPTION(PA_DISABLE_INSTALL "Disable targets install and uninstall (for embedded b
|
||||||
IF(NOT PA_OUTPUT_OSX_FRAMEWORK AND NOT PA_DISABLE_INSTALL)
|
IF(NOT PA_OUTPUT_OSX_FRAMEWORK AND NOT PA_DISABLE_INSTALL)
|
||||||
INCLUDE(CMakePackageConfigHelpers)
|
INCLUDE(CMakePackageConfigHelpers)
|
||||||
|
|
||||||
CONFIGURE_PACKAGE_CONFIG_FILE(cmake_support/portaudioConfig.cmake.in ${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfig.cmake
|
CONFIGURE_PACKAGE_CONFIG_FILE(cmake/portaudioConfig.cmake.in ${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfig.cmake
|
||||||
INSTALL_DESTINATION "lib/cmake/portaudio"
|
INSTALL_DESTINATION "lib/cmake/portaudio"
|
||||||
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
|
NO_CHECK_REQUIRED_COMPONENTS_MACRO)
|
||||||
WRITE_BASIC_PACKAGE_VERSION_FILE(${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfigVersion.cmake
|
WRITE_BASIC_PACKAGE_VERSION_FILE(${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfigVersion.cmake
|
||||||
VERSION ${PA_VERSION}
|
VERSION ${PA_VERSION}
|
||||||
COMPATIBILITY SameMajorVersion)
|
COMPATIBILITY SameMajorVersion)
|
||||||
CONFIGURE_FILE(cmake_support/portaudio-2.0.pc.in ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc @ONLY)
|
CONFIGURE_FILE(cmake/portaudio-2.0.pc.in ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc @ONLY)
|
||||||
INSTALL(FILES README.md DESTINATION share/doc/portaudio)
|
INSTALL(FILES README.md DESTINATION share/doc/portaudio)
|
||||||
INSTALL(FILES LICENSE.txt DESTINATION share/doc/portaudio)
|
INSTALL(FILES LICENSE.txt DESTINATION share/doc/portaudio)
|
||||||
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION lib/pkgconfig)
|
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION lib/pkgconfig)
|
||||||
|
|
@ -467,7 +467,7 @@ IF(NOT PA_OUTPUT_OSX_FRAMEWORK AND NOT PA_DISABLE_INSTALL)
|
||||||
|
|
||||||
IF (NOT TARGET uninstall)
|
IF (NOT TARGET uninstall)
|
||||||
CONFIGURE_FILE(
|
CONFIGURE_FILE(
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_support/cmake_uninstall.cmake.in"
|
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
|
||||||
IMMEDIATE @ONLY)
|
IMMEDIATE @ONLY)
|
||||||
ADD_CUSTOM_TARGET(uninstall
|
ADD_CUSTOM_TARGET(uninstall
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# CMake Toolchain file for cross-compiling PortAudio to i686-w64-mingw32
|
# CMake Toolchain file for cross-compiling PortAudio to i686-w64-mingw32
|
||||||
# Inspired from: https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/cross_compiling/Mingw
|
# Inspired from: https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/cross_compiling/Mingw
|
||||||
# Example usage: $ cmake -DCMAKE_TOOLCHAIN_FILE=i686-w64-mingw32.cmake .
|
# Example usage: $ cmake -DCMAKE_TOOLCHAIN_FILE=cmake/i686-w64-mingw32.cmake .
|
||||||
# i686-w64-mingw32 needs to be installed for this to work. On Debian-based
|
# i686-w64-mingw32 needs to be installed for this to work. On Debian-based
|
||||||
# distributions the package is typically named `mingw-w64`.
|
# distributions the package is typically named `mingw-w64`.
|
||||||
|
|
||||||
Loading…
Reference in a new issue