[KDE/Mac] [phonon/4.8] includes: rename phonon meta include file in the source and instead rename on-install

Harald Sitter sitter at kde.org
Sat Jan 10 10:38:12 UTC 2015


Git commit ff981c63c88936d52f76e8604f9a06e38191741e by Harald Sitter.
Committed on 10/01/2015 at 10:36.
Pushed by sitter into branch '4.8'.

rename phonon meta include file in the source and instead rename on-install

having phonon and Phonon in the same source dir screws with
case-insensitive operating systems.

note: this still is a problem if one installs as on the target it would
still be the same setup with both cased files in the same directory.
searching for the actual include lineup that debian was trying to solve
appears as though it actualy never existed, so I am actually not sure
where one should put the header to avoid this. perhaps it'd be best to
simply not offer the compat option on !linux. it does certainly make a
lot less sense on other systems anyway.

CCMAIL: kde-mac at kde.org

M  +15   -3    includes/CMakeLists.txt
R  +0    -0    includes/old/phonon_meta_include [from: includes/old/phonon - 100% similarity]

http://commits.kde.org/phonon/ff981c63c88936d52f76e8604f9a06e38191741e

diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
index 857fd4e..c27376a 100644
--- a/includes/CMakeLists.txt
+++ b/includes/CMakeLists.txt
@@ -91,10 +91,22 @@ set(COMPAT_HEADERS
     old/Phonon/VolumeFaderInterface
     old/Phonon/VolumeSlider
 )
-install(FILES ${COMPAT_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon COMPONENT Devel)
+
+install(FILES ${COMPAT_HEADERS}
+    DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Phonon
+    COMPONENT Devel)
+# FIXME: phonon/Phonon (dir) and phonon/phonon (file) conflict on case-insensitive
+#        systems if one enables this
 if (PHONON_INSTALL_QT_COMPAT_HEADERS)
-    install(FILES ${COMPAT_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/Phonon COMPONENT Devel) # <Phonon/Foo>
-    install(FILES old/phonon DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel) # <phonon/phonon> meta-include
+    # <Phonon/Foo>
+    install(FILES ${COMPAT_HEADERS}
+        DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/Phonon
+        COMPONENT Devel)
+    # <phonon/phonon> meta-include
+    install(FILES old/phonon_meta_include
+        DESTINATION ${INCLUDE_INSTALL_DIR}/phonon
+        COMPONENT Devel
+        RENAME phonon)
 endif()
 
 if (PHONON_BUILD_EXPERIMENTAL)
diff --git a/includes/old/phonon b/includes/old/phonon_meta_include
similarity index 100%
rename from includes/old/phonon
rename to includes/old/phonon_meta_include


More information about the kde-mac mailing list