Replace "-4.0" by "-4"

2026-02-05 06:05:52 +00:00 · 2023-02-10 19:50:50 +01:00
parent 02c11bc1d7
commit 0940ec9532
30 changed files with 79 additions and 79 deletions
--- a/src/api/CMakeLists.txt
+++ b/src/api/CMakeLists.txt
@ -3,12 +3,12 @@ add_library(projectM_api INTERFACE)
 target_sources(projectM_api
        PRIVATE
        "${PROJECTM_EXPORT_HEADER}"
-        include/projectM-4.0/audio.h
-        include/projectM-4.0/callbacks.h
-        include/projectM-4.0/debug.h
-        include/projectM-4.0/memory.h
-        include/projectM-4.0/projectM.h
-        include/projectM-4.0/types.h
+        include/projectM-4/audio.h
+        include/projectM-4/callbacks.h
+        include/projectM-4/debug.h
+        include/projectM-4/memory.h
+        include/projectM-4/projectM.h
+        include/projectM-4/types.h
        )

 set_target_properties(projectM_api PROPERTIES
@ -23,11 +23,11 @@ target_include_directories(projectM_api
        "$<INSTALL_INTERFACE:${PROJECTM_INCLUDE_DIR}>"
        )

-configure_file(version.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4.0/version.h" @ONLY)
+configure_file(version.h.in "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4/version.h" @ONLY)

 include(GenerateExportHeader)

-set(PROJECTM_EXPORT_HEADER "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4.0/projectM_export.h")
+set(PROJECTM_EXPORT_HEADER "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4/projectM_export.h")

 generate_export_header(projectM_api
        BASE_NAME projectM
@ -42,17 +42,17 @@ install(TARGETS projectM_api
        LIBRARY DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Runtime
        RUNTIME DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Runtime
        ARCHIVE DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Devel
-        PUBLIC_HEADER DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4.0" COMPONENT Devel
+        PUBLIC_HEADER DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4" COMPONENT Devel
        )

 install(FILES
-        "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4.0/projectM_export.h"
-        "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4.0/version.h"
-        DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4.0"
+        "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4/projectM_export.h"
+        "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4/version.h"
+        DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4"
        COMPONENT Devel
        )

-install(DIRECTORY include/projectM-4.0
+install(DIRECTORY include/projectM-4
        DESTINATION "${PROJECTM_INCLUDE_DIR}"
        COMPONENT Devel
        )
--- a/src/api/include/libprojectM/audio.h
+++ b/src/api/include/libprojectM/audio.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/types.h"
+#include "projectM-4/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/api/include/libprojectM/callbacks.h
+++ b/src/api/include/libprojectM/callbacks.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/types.h"
+#include "projectM-4/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/api/include/libprojectM/core.h
+++ b/src/api/include/libprojectM/core.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/types.h"
+#include "projectM-4/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/api/include/libprojectM/debug.h
+++ b/src/api/include/libprojectM/debug.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/types.h"
+#include "projectM-4/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/api/include/libprojectM/memory.h
+++ b/src/api/include/libprojectM/memory.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/types.h"
+#include "projectM-4/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/api/include/libprojectM/parameters.h
+++ b/src/api/include/libprojectM/parameters.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/types.h"
+#include "projectM-4/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/api/include/libprojectM/projectM.h
+++ b/src/api/include/libprojectM/projectM.h
@ -24,12 +24,12 @@

 #pragma once

-#include "projectM-4.0/audio.h"
-#include "projectM-4.0/callbacks.h"
-#include "projectM-4.0/core.h"
-#include "projectM-4.0/debug.h"
-#include "projectM-4.0/memory.h"
-#include "projectM-4.0/parameters.h"
-#include "projectM-4.0/render_opengl.h"
-#include "projectM-4.0/touch.h"
-#include "projectM-4.0/version.h"
+#include "projectM-4/audio.h"
+#include "projectM-4/callbacks.h"
+#include "projectM-4/core.h"
+#include "projectM-4/debug.h"
+#include "projectM-4/memory.h"
+#include "projectM-4/parameters.h"
+#include "projectM-4/render_opengl.h"
+#include "projectM-4/touch.h"
+#include "projectM-4/version.h"
--- a/src/api/include/libprojectM/render_opengl.h
+++ b/src/api/include/libprojectM/render_opengl.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/types.h"
+#include "projectM-4/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/api/include/libprojectM/touch.h
+++ b/src/api/include/libprojectM/touch.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/types.h"
+#include "projectM-4/types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/api/include/libprojectM/types.h
+++ b/src/api/include/libprojectM/types.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/projectM_export.h"
+#include "projectM-4/projectM_export.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/libprojectM/CMakeLists.txt
+++ b/src/libprojectM/CMakeLists.txt
@ -137,7 +137,7 @@ set_target_properties(projectM PROPERTIES
        VERSION "${PROJECTM_LIB_VERSION}"
        SOVERSION "${PROJECTM_SO_VERSION}"
        FOLDER libprojectM
-        OUTPUT_NAME projectM-4.0
+        OUTPUT_NAME projectM-4
        )

 if(BUILD_SHARED_LIBS)
@ -186,7 +186,7 @@ if(ENABLE_CXX_INTERFACE)
            Common.hpp
            PCM.hpp
            ProjectM.hpp
-            DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4.0"
+            DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4"
            COMPONENT Devel
            )
 else()
@ -270,10 +270,10 @@ if(UNIX)
        endforeach()
    endif()

-    set(PKGCONFIG_PACKAGE_NAME "projectM-4.0")
+    set(PKGCONFIG_PACKAGE_NAME "projectM-4")
    set(PKGCONFIG_PACKAGE_DESCRIPTION "projectM Music Visualizer")
    set(PKGCONFIG_PACKAGE_REQUIREMENTS_ALL "opengl")

-    generate_pkg_config_files(projectM projectM-4.0)
+    generate_pkg_config_files(projectM projectM-4)

 endif()
--- a/src/libprojectM/PCM.hpp
+++ b/src/libprojectM/PCM.hpp
@ -28,7 +28,7 @@

 #pragma once

-#include "projectM-4.0/projectM_export.h"
+#include "projectM-4/projectM_export.h"

 #include <array>
 #include <cstdint>
--- a/src/libprojectM/ProjectM.hpp
+++ b/src/libprojectM/ProjectM.hpp
@ -20,7 +20,7 @@
 */
 #pragma once

-#include "projectM-4.0/projectM_export.h"
+#include "projectM-4/projectM_export.h"

 #include "libprojectM/Common.hpp"
 #include "libprojectM/PCM.hpp"
--- a/src/libprojectM/ProjectMCWrapper.cpp
+++ b/src/libprojectM/ProjectMCWrapper.cpp
@ -1,6 +1,6 @@
 #include "ProjectMCWrapper.hpp"

-#include "projectM-4.0/projectM.h"
+#include "projectM-4/projectM.h"

 #include <cstring>
 #include <utility>
--- a/src/libprojectM/ProjectMCWrapper.hpp
+++ b/src/libprojectM/ProjectMCWrapper.hpp
@ -23,7 +23,7 @@

 #include "ProjectM.hpp"

-#include "projectM-4.0/projectM.h"
+#include "projectM-4/projectM.h"

 class projectMWrapper : public ProjectM
 {
--- a/src/playlist/CMakeLists.txt
+++ b/src/playlist/CMakeLists.txt
@ -11,14 +11,14 @@ add_library(projectM_playlist_main OBJECT
        Playlist.hpp
        PlaylistCWrapper.cpp
        PlaylistCWrapper.hpp
-        api/projectM-4.0/playlist.h
-        api/projectM-4.0/playlist_callbacks.h
-        api/projectM-4.0/playlist_core.h
-        api/projectM-4.0/playlist_filter.h
-        api/projectM-4.0/playlist_items.h
-        api/projectM-4.0/playlist_memory.h
-        api/projectM-4.0/playlist_playback.h
-        api/projectM-4.0/playlist_types.h
+        api/projectM-4/playlist.h
+        api/projectM-4/playlist_callbacks.h
+        api/projectM-4/playlist_core.h
+        api/projectM-4/playlist_filter.h
+        api/projectM-4/playlist_items.h
+        api/projectM-4/playlist_memory.h
+        api/projectM-4/playlist_playback.h
+        api/projectM-4/playlist_types.h
        )

 target_include_directories(projectM_playlist_main
@ -43,7 +43,7 @@ set_target_properties(projectM_playlist PROPERTIES
        SOVERSION "${PROJECTM_SO_VERSION}"
        EXPORT_NAME playlist
        FOLDER libprojectM
-        OUTPUT_NAME projectM-4.0-playlist
+        OUTPUT_NAME projectM-4-playlist
        )

 target_include_directories(projectM_playlist
@ -82,7 +82,7 @@ endif()

 include(GenerateExportHeader)

-set(PROJECTM_PLAYLIST_EXPORT_HEADER "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4.0/projectM_playlist_export.h")
+set(PROJECTM_PLAYLIST_EXPORT_HEADER "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4/projectM_playlist_export.h")

 generate_export_header(projectM_playlist
        BASE_NAME projectM_playlist
@ -99,16 +99,16 @@ install(TARGETS projectM_playlist
        LIBRARY DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Runtime
        RUNTIME DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Runtime
        ARCHIVE DESTINATION "${PROJECTM_LIB_DIR}" COMPONENT Devel
-        PUBLIC_HEADER DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4.0" COMPONENT Devel
+        PUBLIC_HEADER DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4" COMPONENT Devel
        )

 install(FILES
-        "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4.0/projectM_playlist_export.h"
-        DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4.0"
+        "${CMAKE_CURRENT_BINARY_DIR}/include/projectM-4/projectM_playlist_export.h"
+        DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4"
        COMPONENT Devel
        )

-install(DIRECTORY api/projectM-4.0
+install(DIRECTORY api/projectM-4
        DESTINATION "${PROJECTM_INCLUDE_DIR}"
        COMPONENT Devel
        )
@ -147,10 +147,10 @@ install(EXPORT libprojectMPlaylist
 if(UNIX)
    include(GeneratePkgConfigFiles)

-    set(PKGCONFIG_PACKAGE_NAME "projectM-4.0-playlist")
+    set(PKGCONFIG_PACKAGE_NAME "projectM-4-playlist")
    set(PKGCONFIG_PACKAGE_DESCRIPTION "projectM Playlist Library")
-    set(PKGCONFIG_PACKAGE_REQUIREMENTS_RELEASE "projectM-4.0")
+    set(PKGCONFIG_PACKAGE_REQUIREMENTS_RELEASE "projectM-4")
    set(PKGCONFIG_PACKAGE_REQUIREMENTS_DEBUG "libprojectM-debug")

-    generate_pkg_config_files(projectM_playlist projectM-4.0-playlist)
+    generate_pkg_config_files(projectM_playlist projectM-4-playlist)
 endif()
--- a/src/playlist/PlaylistCWrapper.cpp
+++ b/src/playlist/PlaylistCWrapper.cpp
@ -1,7 +1,7 @@
 #include "PlaylistCWrapper.hpp"

-#include "projectM-4.0/callbacks.h"
-#include "projectM-4.0/core.h"
+#include "projectM-4/callbacks.h"
+#include "projectM-4/core.h"

 using ProjectM::Playlist::Playlist;

--- a/src/playlist/PlaylistCWrapper.hpp
+++ b/src/playlist/PlaylistCWrapper.hpp
@ -1,6 +1,6 @@
 #pragma once

-#include "projectM-4.0/playlist.h"
+#include "projectM-4/playlist.h"

 #include "Playlist.hpp"

--- a/src/playlist/api/libprojectM/playlist.h
+++ b/src/playlist/api/libprojectM/playlist.h
@ -25,10 +25,10 @@

 #pragma once

-#include "projectM-4.0/playlist_callbacks.h"
-#include "projectM-4.0/playlist_core.h"
-#include "projectM-4.0/playlist_filter.h"
-#include "projectM-4.0/playlist_items.h"
-#include "projectM-4.0/playlist_memory.h"
-#include "projectM-4.0/playlist_playback.h"
-#include "projectM-4.0/playlist_types.h"
+#include "projectM-4/playlist_callbacks.h"
+#include "projectM-4/playlist_core.h"
+#include "projectM-4/playlist_filter.h"
+#include "projectM-4/playlist_items.h"
+#include "projectM-4/playlist_memory.h"
+#include "projectM-4/playlist_playback.h"
+#include "projectM-4/playlist_types.h"
--- a/src/playlist/api/libprojectM/playlist_callbacks.h
+++ b/src/playlist/api/libprojectM/playlist_callbacks.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/playlist_types.h"
+#include "projectM-4/playlist_types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/playlist/api/libprojectM/playlist_core.h
+++ b/src/playlist/api/libprojectM/playlist_core.h
@ -25,8 +25,8 @@

 #pragma once

-#include "projectM-4.0/types.h"
-#include "projectM-4.0/playlist_types.h"
+#include "projectM-4/types.h"
+#include "projectM-4/playlist_types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/playlist/api/libprojectM/playlist_filter.h
+++ b/src/playlist/api/libprojectM/playlist_filter.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/playlist_types.h"
+#include "projectM-4/playlist_types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/playlist/api/libprojectM/playlist_items.h
+++ b/src/playlist/api/libprojectM/playlist_items.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/playlist_types.h"
+#include "projectM-4/playlist_types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/playlist/api/libprojectM/playlist_memory.h
+++ b/src/playlist/api/libprojectM/playlist_memory.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/playlist_types.h"
+#include "projectM-4/playlist_types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/playlist/api/libprojectM/playlist_playback.h
+++ b/src/playlist/api/libprojectM/playlist_playback.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/playlist_types.h"
+#include "projectM-4/playlist_types.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/playlist/api/libprojectM/playlist_types.h
+++ b/src/playlist/api/libprojectM/playlist_types.h
@ -25,7 +25,7 @@

 #pragma once

-#include "projectM-4.0/projectM_playlist_export.h"
+#include "projectM-4/projectM_playlist_export.h"

 #ifdef __cplusplus
 extern "C" {
--- a/src/sdl-test-ui/pmSDL.hpp
+++ b/src/sdl-test-ui/pmSDL.hpp
@ -39,8 +39,8 @@
 #define STEREOSCOPIC_SBS 0

 // projectM
-#include <projectM-4.0/playlist.h>
-#include <projectM-4.0/projectM.h>
+#include <projectM-4/playlist.h>
+#include <projectM-4/projectM.h>

 // projectM SDL
 #include "audioCapture.hpp"
--- a/tests/playlist/APITest.cpp
+++ b/tests/playlist/APITest.cpp
@ -1,6 +1,6 @@
 #include "PlaylistCWrapperMock.h"

-#include <api/projectM-4.0/playlist.h>
+#include <api/projectM-4/playlist.h>

 #include <gtest/gtest.h>

--- a/tests/playlist/ProjectMAPIMocks.cpp
+++ b/tests/playlist/ProjectMAPIMocks.cpp
@ -3,8 +3,8 @@
 * in their implementation in this test suite.
 */

-#include <projectM-4.0/projectM.h>
-#include <projectM-4.0/projectM_export.h>
+#include <projectM-4/projectM.h>
+#include <projectM-4/projectM_export.h>

 PROJECTM_EXPORT void projectm_set_preset_switch_requested_event_callback(projectm_handle instance,
                                                         projectm_preset_switch_requested_event callback,