rename cmake_support directory to cmake

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 68e4b6c3466aa949c6658abb6fade94ddcdcc053..db66912766e05d46b883ef9dbee8737d31d4f6ef 100644 (file)
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -19,7 +19,7 @@ jobs:
             os: ubuntu-latest
             install_dir: ~/portaudio
             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
             os: windows-latest
             install_dir: C:\portaudio

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c90862af9ba5578a1488e620c0dd6f65bfb61ce..39276463f948c986f47e014495c14a7cf0a7104d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,7 @@ SOURCE_GROUP("common" FILES ${PA_COMMON_INCLUDES} ${PA_COMMON_SOURCES})
 
 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)
 SOURCE_GROUP("hostapi\\skeleton" ${PA_SKELETON_SOURCES})
@@ -230,8 +230,8 @@ IF(WIN32)
   ENDIF()
 
   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_support/options_cmake.h.in ${CMAKE_CURRENT_BINARY_DIR}/options_cmake.h @ONLY)
+  CONFIGURE_FILE(cmake/template_portaudio.def ${CMAKE_CURRENT_BINARY_DIR}/portaudio_cmake.def @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_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)
@@ -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)
   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"
     NO_CHECK_REQUIRED_COMPONENTS_MACRO)
   WRITE_BASIC_PACKAGE_VERSION_FILE(${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfigVersion.cmake
     VERSION ${PA_VERSION}
     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 LICENSE.txt DESTINATION share/doc/portaudio)
   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)
     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"
       IMMEDIATE @ONLY)
     ADD_CUSTOM_TARGET(uninstall

diff --git a/cmake_support/FindASIOSDK.cmake b/cmake/FindASIOSDK.cmake
similarity index 100%
rename from cmake_support/FindASIOSDK.cmake
rename to cmake/FindASIOSDK.cmake

diff --git a/cmake_support/FindJack.cmake b/cmake/FindJack.cmake
similarity index 100%
rename from cmake_support/FindJack.cmake
rename to cmake/FindJack.cmake

diff --git a/cmake_support/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
similarity index 100%
rename from cmake_support/cmake_uninstall.cmake.in
rename to cmake/cmake_uninstall.cmake.in

diff --git a/i686-w64-mingw32.cmake b/cmake/i686-w64-mingw32.cmake
similarity index 89%
rename from i686-w64-mingw32.cmake
rename to cmake/i686-w64-mingw32.cmake
index c3331b67a1b5bd16d35dd8a384e21670581d9023..558c0bdbb6a3b117f77d55f9a5044392be086fd8 100644 (file)
--- a/i686-w64-mingw32.cmake
+++ b/cmake/i686-w64-mingw32.cmake
@@ -1,6 +1,6 @@
 # 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
-# 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
 # distributions the package is typically named `mingw-w64`.
 

diff --git a/cmake_support/options_cmake.h.in b/cmake/options_cmake.h.in
similarity index 100%
rename from cmake_support/options_cmake.h.in
rename to cmake/options_cmake.h.in

diff --git a/cmake_support/portaudio-2.0.pc.in b/cmake/portaudio-2.0.pc.in
similarity index 100%
rename from cmake_support/portaudio-2.0.pc.in
rename to cmake/portaudio-2.0.pc.in

diff --git a/cmake_support/portaudioConfig.cmake.in b/cmake/portaudioConfig.cmake.in
similarity index 100%
rename from cmake_support/portaudioConfig.cmake.in
rename to cmake/portaudioConfig.cmake.in

diff --git a/cmake_support/template_portaudio.def b/cmake/template_portaudio.def
similarity index 100%
rename from cmake_support/template_portaudio.def
rename to cmake/template_portaudio.def