[rkward-cvs] SF.net SVN: rkward:[4056] trunk/rkward/rkward

[m-eik at users.sourceforge.net]

Revision: 4056
          http://rkward.svn.sourceforge.net/rkward/?rev=4056&view=rev
Author:   m-eik
Date:     2011-11-29 13:39:11 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
replacing IF(APPLE) with IF(Q_WS_MAC) in CMakeLists.txt

Modified Paths:
--------------
    trunk/rkward/rkward/CMakeLists.txt
    trunk/rkward/rkward/rbackend/CMakeLists.txt

Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt	2011-11-29 09:01:23 UTC (rev 4055)
+++ trunk/rkward/rkward/CMakeLists.txt	2011-11-29 13:39:11 UTC (rev 4056)
@@ -35,15 +35,15 @@
 GET_DIRECTORY_PROPERTY(R_SHAREDLIBDIR DIRECTORY rbackend LINK_DIRECTORIES)
 LINK_DIRECTORIES(${R_SHAREDLIBDIR})
 
-IF(APPLE)
+IF(Q_WS_MAC)
 	SET(RKWARD_FRONTEND_LOCATION ${BIN_INSTALL_DIR}/rkward.frontend.app/Contents/MacOS)
 	SET(CPACK_BUNDLE_ICON rkward.icns)
 	SET(CPACK_BUNDLE_NAME RKWard)
 	SET(CPACK_BUNDLE_STARTUP_COMMAND rkward)
 #	SET(CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/rkward/Info.plist)
-ELSE(APPLE)
+ELSE(Q_WS_MAC)
 	SET(RKWARD_FRONTEND_LOCATION ${LIBEXEC_INSTALL_DIR})
-ENDIF(APPLE)
+ENDIF(Q_WS_MAC)
 
 KDE4_ADD_EXECUTABLE(rkward.frontend ${RKWard_Sources})
 
@@ -71,14 +71,14 @@
 
 INSTALL(FILES resource.ver rkwardui.rc rkconsolepart.rc DESTINATION ${DATA_INSTALL_DIR}/rkward )
 
-IF(APPLE)
+IF(Q_WS_MAC)
 	INSTALL(TARGETS rkward.frontend DESTINATION ${BIN_INSTALL_DIR})
 	INSTALL(PROGRAMS ${RKWARD_WRAPPER_SCRIPT} DESTINATION ${BUNDLE_INSTALL_DIR}/${CPACK_BUNDLE_NAME}.app/Contents/MacOS)
 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/rkward/icons/app-icon/rkward.icns DESTINATION ${BUNDLE_INSTALL_DIR}/${CPACK_BUNDLE_NAME}.app/Contents/Resources)
 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/rkward/Info.plist DESTINATION ${BUNDLE_INSTALL_DIR}/${CPACK_BUNDLE_NAME}.app/Contents)
-ELSE(APPLE)
+ELSE(Q_WS_MAC)
 	INSTALL(TARGETS rkward.frontend DESTINATION ${LIBEXEC_INSTALL_DIR})
 	INSTALL(PROGRAMS ${RKWARD_WRAPPER_SCRIPT} DESTINATION ${BIN_INSTALL_DIR})
-ENDIF(APPLE)
+ENDIF(Q_WS_MAC)
 
 INSTALL(FILES rkward.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})

Modified: trunk/rkward/rkward/rbackend/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/rbackend/CMakeLists.txt	2011-11-29 09:01:23 UTC (rev 4055)
+++ trunk/rkward/rkward/rbackend/CMakeLists.txt	2011-11-29 13:39:11 UTC (rev 4056)
@@ -66,11 +66,7 @@
 		# all the KDE library versions, first, when loading DLLs
 		INSTALL(TARGETS rkward.rbackend DESTINATION ${BIN_INSTALL_DIR}/rbackend)
 	ELSE(WIN32)
-		IF(APPLE)
-			INSTALL(TARGETS rkward.rbackend DESTINATION ${BIN_INSTALL_DIR}/rkward.frontend.app/Contents/MacOS)
-		ELSE(APPLE)
-			INSTALL(TARGETS rkward.rbackend DESTINATION ${LIBEXEC_INSTALL_DIR})
-		ENDIF(APPLE)
+			INSTALL(TARGETS rkward.rbackend DESTINATION ${RKWARD_FRONTEND_LOCATION})
 	ENDIF(WIN32)
 ELSE(RBACKEND_SPLIT)
 	SET (

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.