ports/cmake: use target_compile_options() for pulse/jack/tinyalsa (bu…

…g 366) git-svn-id: svn://scm.orgis.org/mpg123/trunk@5393 35dc7657-300d-0410-a2e5-dc2837fedb53
madebr · Jan 10, 2024 · 075b2b9 · 075b2b9
1 parent 80c26dc
commit 075b2b9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,9 @@
+1.32.5
+------
+
+- build:
+-- CMake port uses CFLAGS for pulse/jack/tinyalsa properly now (bug 366).
+
 1.32.4
 ------
 - build:

diff --git a/ports/cmake/src/libout123/modules/CMakeLists.txt b/ports/cmake/src/libout123/modules/CMakeLists.txt
@@ -17,11 +17,11 @@ if(NOT USE_MODULES)
         $<$<STREQUAL:${DEFAULT_OUTPUT_MODULE},win32>:${WIN32_LIBRARIES}>
         $<$<STREQUAL:${DEFAULT_OUTPUT_MODULE},win32_wasapi>:${WIN32_WASAPI_LIBRARIES}>)
     if(DEFAULT_OUTPUT_MODULE STREQUAL "pulse")
-        target_compile_definitions(defaultmodule PRIVATE ${PULSE_CFLAGS})
+        target_compile_options(defaultmodule PRIVATE ${PULSE_CFLAGS})
     elseif(DEFAULT_OUTPUT_MODULE STREQUAL "jack")
-        target_compile_definitions(defaultmodule PRIVATE ${JACK_CFLAGS})
+        target_compile_options(defaultmodule PRIVATE ${JACK_CFLAGS})
     elseif(DEFAULT_OUTPUT_MODULE STREQUAL "tinyalsa")
-        target_compile_definitions(defaultmodule PRIVATE ${TINYALSA_CFLAGS})
+        target_compile_options(defaultmodule PRIVATE ${TINYALSA_CFLAGS})
     endif()
     if(BUILD_SHARED_LIBS)
         set_target_properties(defaultmodule PROPERTIES POSITION_INDEPENDENT_CODE ON)

diff --git a/src/version.h b/src/version.h
@@ -16,7 +16,7 @@
 // only single spaces as separator to ease parsing by build scripts
 #define MPG123_MAJOR 1
 #define MPG123_MINOR 32
-#define MPG123_PATCH 4
+#define MPG123_PATCH 5
 // Don't get too wild with that to avoid confusing m4. No brackets.
 // Also, it should fit well into a sane file name for the tarball.
 #define MPG123_SUFFIX "-dev"
-Original file line number
+Diff line change
@@ -1,3 +1,9 @@
+.32.5
+    ------
+    - build:
+    -- CMake port uses CFLAGS for pulse/jack/tinyalsa properly now (bug 366).
 .32.4
     ------
     - build:
@@ Expand Down @@