[Plplot-cvs] SF.net SVN: plplot:[10321] trunk/cmake/modules

[<ai...@us...>]

Revision: 10321
          http://plplot.svn.sourceforge.net/plplot/?rev=10321&view=rev
Author:   airwin
Date:     2009-08-24 14:31:13 +0000 (Mon, 24 Aug 2009)

Log Message:
-----------
Silently drop aqt device driver if not Darwin.
Silently drop wingcc device driver if not Windows (WIN32).

These two changes means it is possible on a fully loaded Linux system to
have a WARNING-free cmake result even when -DDEFAULT_ALL_DEVICES=ON.

Modified Paths:
--------------
    trunk/cmake/modules/aqt.cmake
    trunk/cmake/modules/wingcc.cmake

Modified: trunk/cmake/modules/aqt.cmake
===================================================================
--- trunk/cmake/modules/aqt.cmake	2009-08-24 14:02:24 UTC (rev 10320)
+++ trunk/cmake/modules/aqt.cmake	2009-08-24 14:31:13 UTC (rev 10321)
@@ -27,15 +27,19 @@
 # DRIVERS_LINK_FLAGS  - list of LINK_FLAGS for all static device drivers.
 #
 
-include(FindAQT)
+# Darwin-only device driver.
+if(PLD_aqt AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  set(PLD_aqt OFF CACHE BOOL "Enable aqt device" FORCE)
+endif(PLD_aqt AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 
-IF (AQT_FOUND)
-	MESSAGE(STATUS "Found AQT: ${AQT_FRAMEWORK}")
-	IF (PLD_aqt)
-		SET(aqt_COMPILE_FLAGS "-ObjC")
-		SET(aqt_LINK_FLAGS "-framework AquaTerm -framework Foundation")
-		SET(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${aqt_LINK_FLAGS})
-	ENDIF (PLD_aqt)
-ELSE (AQT_FOUND)
-	SET(PLD_aqt OFF CACHE BOOL "Enable aqt device" FORCE)
-ENDIF (AQT_FOUND)
+if(PLD_aqt)
+  include(FindAQT)
+  if(AQT_FOUND)
+    message(STATUS "Found AQT: ${AQT_FRAMEWORK}")
+    set(aqt_COMPILE_FLAGS "-ObjC")
+    set(aqt_LINK_FLAGS "-framework AquaTerm -framework Foundation")
+    set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${aqt_LINK_FLAGS})
+  else(AQT_FOUND)
+  set(PLD_aqt OFF CACHE BOOL "Enable aqt device" FORCE)
+  endif(AQT_FOUND)
+endif(PLD_aqt)

Modified: trunk/cmake/modules/wingcc.cmake
===================================================================
--- trunk/cmake/modules/wingcc.cmake	2009-08-24 14:02:24 UTC (rev 10320)
+++ trunk/cmake/modules/wingcc.cmake	2009-08-24 14:31:13 UTC (rev 10321)
@@ -27,6 +27,11 @@
 # 			    wingcc device.
 # DRIVERS_LINK_FLAGS	  - list of LINK_FLAGS for all static devices.
 
+# Windows-only device driver.
+if(PLD_wingcc AND NOT WIN32)
+  set(PLD_wingcc OFF CACHE BOOL "Enable wingcc device" FORCE)
+endif(PLD_wingcc AND NOT WIN32)
+
 if(PLD_wingcc)
   message(STATUS "Looking for gdi32 header and library")
   find_library(GDI32_LIBRARY gdi32 HINTS ${MINGWLIBPATH} ${BORLANDLIBPATH})


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