[Avidemux-svn-commit] r3687 - branches/avidemux_2.4_branch/avidemux

gruntster at mail.berlios.de gruntster at mail.berlios.de
Fri Nov 9 17:34:08 CET 2007


Author: gruntster
Date: 2007-11-09 17:34:00 +0100 (Fri, 09 Nov 2007)
New Revision: 3687

Modified:
   branches/avidemux_2.4_branch/avidemux/CMakeLists.txt
Log:
[Mac] fix libpng when using MacPorts Qt4

Modified: branches/avidemux_2.4_branch/avidemux/CMakeLists.txt
===================================================================
--- branches/avidemux_2.4_branch/avidemux/CMakeLists.txt	2007-11-08 18:38:18 UTC (rev 3686)
+++ branches/avidemux_2.4_branch/avidemux/CMakeLists.txt	2007-11-09 16:34:00 UTC (rev 3687)
@@ -276,9 +276,13 @@
 		TARGET_LINK_LIBRARIES(avidemux2_gtk png)
 	endif(GTK_FOUND)
 	
-	if(QT4_FOUND AND NOT ADM_OS_APPLE)
-		TARGET_LINK_LIBRARIES(avidemux2_qt4 png)
-	endif(QT4_FOUND AND NOT ADM_OS_APPLE)
+	if (QT4_FOUND)
+		if (ADM_OS_APPLE AND NOT QT_USE_FRAMEWORKS)
+			TARGET_LINK_LIBRARIES(avidemux2_qt4 png)
+		elseif (NOT ADM_OS_APPLE)
+			TARGET_LINK_LIBRARIES(avidemux2_qt4 png)
+		endif (ADM_OS_APPLE AND NOT QT_USE_FRAMEWORKS)
+	endif (QT4_FOUND)
 endif(USE_PNG)
 
 # Xml2




More information about the Avidemux-svn-commit mailing list