Smalltalk › Squeak › Squeak VM

[commit] r2084 - configure build variables via macros in config scripts

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
commits-3
Reply | Threaded
Open this post in threaded view
♦
♦
|

[commit] r2084 - configure build variables via macros in config scripts

commits-3
 
Author: piumarta
Date: 2009-08-25 13:54:12 -0700 (Tue, 25 Aug 2009)
New Revision: 2084

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/cmake/PluginExternal.cmake
   trunk/platforms/unix/cmake/PluginInternal.cmake
   trunk/platforms/unix/cmake/Plugins.cmake
   trunk/platforms/unix/plugins/AioPlugin/build.cmake
   trunk/platforms/unix/plugins/B3DAcceleratorPlugin/build.cmake
   trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake
   trunk/platforms/unix/plugins/DBusPlugin/config.cmake
   trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake
   trunk/platforms/unix/plugins/HostWindowPlugin/config.cmake
   trunk/platforms/unix/plugins/ImmX11Plugin/config.cmake
   trunk/platforms/unix/plugins/OggPlugin/config.cmake
   trunk/platforms/unix/plugins/PseudoTTYPlugin/build.cmake
   trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake
   trunk/platforms/unix/plugins/RomePlugin/config.cmake
   trunk/platforms/unix/plugins/SqueakFFIPrims/build.cmake
   trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake
   trunk/platforms/unix/plugins/UUIDPlugin/config.cmake
   trunk/platforms/unix/plugins/UnixOSProcessPlugin/build.cmake
   trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake
   trunk/platforms/unix/plugins/XDisplayControlPlugin/build.cmake
   trunk/platforms/unix/plugins/XDisplayControlPlugin/config.cmake
   trunk/platforms/unix/vm-display-Quartz/build.cmake
   trunk/platforms/unix/vm-display-Quartz/config.cmake
   trunk/platforms/unix/vm-display-X11/build.cmake
   trunk/platforms/unix/vm-display-X11/config.cmake
   trunk/platforms/unix/vm-display-fbdev/config.cmake
   trunk/platforms/unix/vm-sound-ALSA/config.cmake
   trunk/platforms/unix/vm-sound-MacOSX/config.cmake
   trunk/platforms/unix/vm-sound-NAS/config.cmake
   trunk/platforms/unix/vm-sound-OSS/config.cmake
   trunk/platforms/unix/vm-sound-Sun/config.cmake
Log:
configure build variables via macros in config scripts

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/ChangeLog 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,3 +1,45 @@
+2009-08-25    <[hidden email]>
+
+ * cmake/Plugins.cmake: Add macros PLUGIN_DISABLE, PLUGIN_SOURCES,
+ PLUGIN_DEFINITIONS, PLUGIN_INCLUDE_DIRECTORIES,
+ PLUGIN_LINK_DIRECTORIES, PLUGIN_LINK_LIBRARIES.
+
+ * cmake/PluginExternal.cmake, cmake/PluginInternal.cmake: Set
+ definitions, include dirs and link dirs from configured values.
+ Add link directories before defining target.
+
+ * cmake/PluginExternal.cmake, cmake/Plugins.cmake,
+ cmake/PluginInternal.cmake, plugins/PseudoTTYPlugin/config.cmake,
+ plugins/PseudoTTYPlugin/build.cmake,
+ plugins/RomePlugin/config.cmake,
+ plugins/HostWindowPlugin/config.cmake,
+ plugins/UUIDPlugin/config.cmake, plugins/AioPlugin/build.cmake,
+ plugins/SqueakFFIPrims/config.cmake,
+ plugins/SqueakFFIPrims/build.cmake,
+ plugins/ImmX11Plugin/config.cmake, plugins/OggPlugin/config.cmake,
+ plugins/B3DAcceleratorPlugin/config.cmake,
+ plugins/B3DAcceleratorPlugin/build.cmake,
+ plugins/UnixOSProcessPlugin/config.cmake,
+ plugins/UnixOSProcessPlugin/build.cmake,
+ plugins/GStreamerPlugin/config.cmake,
+ plugins/DBusPlugin/config.cmake,
+ plugins/XDisplayControlPlugin/config.cmake,
+ plugins/XDisplayControlPlugin/build.cmake,
+ vm-sound-ALSA/config.cmake, vm-sound-NAS/config.cmake,
+ vm-display-X11/config.cmake, vm-display-X11/build.cmake,
+ vm-sound-MacOSX/config.cmake, vm-display-fbdev/config.cmake,
+ vm-display-Quartz/config.cmake, vm-display-Quartz/build.cmake,
+ vm-sound-OSS/config.cmake, vm-sound-Sun/config.cmake: Configure
+ build variables using new macros.
+
+ * plugins/DropPlugin/config.cmake, plugins/AioPlugin/config.cmake,
+ plugins/FloatMathPlugin/config.cmake: Configure build variables.
+
+ * plugins/RomePlugin/build.cmake, plugins/DropPlugin/build.cmake,
+ plugins/UUIDPlugin/build.cmake,
+ plugins/FloatMathPlugin/build.cmake, vm-display-fbdev/build.cmake:
+ Remove redundant build scripts.
+
 2009-08-24    <[hidden email]>
 
  * CMakeLists.txt: Set RPATH options appropriately for build and install.

Modified: trunk/platforms/unix/cmake/PluginExternal.cmake
===================================================================
--- trunk/platforms/unix/cmake/PluginExternal.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/cmake/PluginExternal.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,5 +1,6 @@
-ADD_LIBRARY (@plugin@ MODULE @plugin_sources@)
-INCLUDE_DIRECTORIES (
+ADD_DEFINITIONS (${@plugin@_definitions})
+LINK_DIRECTORIES (${@plugin@_link_directories})
+INCLUDE_DIRECTORIES (${@plugin@_include_directories}
     ${bld}
     ${src}/vm
     ${cross}/vm
@@ -10,4 +11,9 @@
     ${unix}/@plugin@
     ${cross}/plugins/@plugin@
 )
+
+ADD_LIBRARY (@plugin@ MODULE @plugin_sources@)
+
+TARGET_LINK_LIBRARIES (@plugin@ ${@plugin@_link_libraries})
+
 INSTALL (TARGETS @plugin@ LIBRARY DESTINATION @plgdir@)

Modified: trunk/platforms/unix/cmake/PluginInternal.cmake
===================================================================
--- trunk/platforms/unix/cmake/PluginInternal.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/cmake/PluginInternal.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,6 +1,6 @@
-ADD_LIBRARY (@plugin@ STATIC @plugin_sources@)
-ADD_DEFINITIONS (-DSQUEAK_BUILTIN_PLUGIN=1)
-INCLUDE_DIRECTORIES (
+ADD_DEFINITIONS (-DSQUEAK_BUILTIN_PLUGIN=1 ${@plugin@_definitions})
+LINK_DIRECTORIES (${@plugin@_link_directories})
+INCLUDE_DIRECTORIES (${@plugin@_include_directories}
     ${bld}
     ${src}/vm
     ${cross}/vm
@@ -11,3 +11,5 @@
     ${unix}/@plugin@
     ${cross}/plugins/@plugin@
 )
+
+ADD_LIBRARY (@plugin@ STATIC @plugin_sources@)

Modified: trunk/platforms/unix/cmake/Plugins.cmake
===================================================================
--- trunk/platforms/unix/cmake/Plugins.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/cmake/Plugins.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,6 +1,6 @@
 # Figure out which plugins to build and create a configuration for each.
 #
-# Last edited: 2009-08-21 10:35:56 by piumarta on ubuntu.piumarta.com
+# Last edited: 2009-08-25 13:46:02 by piumarta on ubuntu.piumarta.com
 
 FILE (STRINGS ${src}/plugins.int plugins_int)
 STRING (REGEX REPLACE ".*= (.*)" "\\1" plugins_int ${plugins_int})
@@ -29,10 +29,11 @@
       STRING_APPEND (plugin_sources "${tmp}")
     ENDFOREACH (dir)
   ENDIF (DEFINED ${plugin}_sources)
-  FILE_COPY (${bld}/${plugin}/CMakeLists.in ${config}/PluginInternal.cmake)
+  FILE (WRITE ${bld}/${plugin}/CMakeLists.in "")
   FOREACH (dir ${unix}/plugins ${unix})
     FILE_APPEND (${bld}/${plugin}/CMakeLists.in ${dir}/${plugin}/build.cmake)
   ENDFOREACH (dir)
+  FILE_APPEND (${bld}/${plugin}/CMakeLists.in ${config}/PluginInternal.cmake)
   CONFIGURE_FILE (${bld}/${plugin}/CMakeLists.in ${bld}/${plugin}/CMakeLists.txt @ONLY)
   ADD_SUBDIRECTORY (${bld}/${plugin} ${bld}/${plugin})
 ENDMACRO (INTERNAL_PLUGIN)
@@ -48,18 +49,39 @@
       STRING_APPEND (plugin_sources "${tmp}")
     ENDFOREACH (dir)
   ENDIF (DEFINED ${plugin}_sources)
-  FILE_COPY (${bld}/${plugin}/CMakeLists.in ${config}/PluginExternal.cmake)
+  FILE (WRITE ${bld}/${plugin}/CMakeLists.in "")
   FOREACH (dir ${unix}/plugins ${unix})
     FILE_APPEND (${bld}/${plugin}/CMakeLists.in ${dir}/${plugin}/build.cmake)
   ENDFOREACH (dir)
+  FILE_APPEND (${bld}/${plugin}/CMakeLists.in ${config}/PluginExternal.cmake)
   CONFIGURE_FILE (${bld}/${plugin}/CMakeLists.in ${bld}/${plugin}/CMakeLists.txt @ONLY)
   ADD_SUBDIRECTORY (${bld}/${plugin} ${bld}/${plugin})
 ENDMACRO (EXTERNAL_PLUGIN)
 
-MACRO (DISABLE_PLUGIN)
+MACRO (PLUGIN_DISABLE)
   SET (plugin_disabled 1)
-ENDMACRO (DISABLE_PLUGIN)
+ENDMACRO (PLUGIN_DISABLE)
 
+MACRO (PLUGIN_SOURCES)
+  SET (${plugin}_sources ${ARGV})
+ENDMACRO (PLUGIN_SOURCES)
+
+MACRO (PLUGIN_DEFINITIONS)
+  SET (${plugin}_definitions ${${plugin}_definitions} ${ARGV})
+ENDMACRO (PLUGIN_DEFINITIONS)
+
+MACRO (PLUGIN_INCLUDE_DIRECTORIES)
+  SET (${plugin}_include_directories ${${plugin}_include_directories} ${ARGV})
+ENDMACRO (PLUGIN_INCLUDE_DIRECTORIES)
+
+MACRO (PLUGIN_LINK_DIRECTORIES)
+  SET (${plugin}_link_directories ${${plugin}_link_directories} ${ARGV})
+ENDMACRO (PLUGIN_LINK_DIRECTORIES)
+
+MACRO (PLUGIN_LINK_LIBRARIES)
+  SET (${plugin}_link_libraries ${${plugin}_link_libraries} ${ARGV})
+ENDMACRO (PLUGIN_LINK_LIBRARIES)
+
 MACRO (CONFIGURE_PLUGIN_LIST plugins_list)
   SET (plugins ${${plugins_list}})
   FOREACH (plugin ${plugins})

Modified: trunk/platforms/unix/plugins/AioPlugin/build.cmake
===================================================================
--- trunk/platforms/unix/plugins/AioPlugin/build.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/AioPlugin/build.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,3 +1 @@
-INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin)
-ADD_DEFINITIONS (-DSQAIO_H=\"sqaio.h\")
 EXPECT_UNDEFINED_SYMBOLS ()

Modified: trunk/platforms/unix/plugins/B3DAcceleratorPlugin/build.cmake
===================================================================
--- trunk/platforms/unix/plugins/B3DAcceleratorPlugin/build.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/B3DAcceleratorPlugin/build.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -2,5 +2,4 @@
 # (vm-display-Quartz) as a dependency.  This lets 3D work in both X11 and Quartz
 # on MacOS.
 
-INCLUDE_DIRECTORIES (${OPENGL_INCLUDE_DIR})
 EXPECT_UNDEFINED_SYMBOLS ()

Modified: trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,5 +1,6 @@
 IF (OPENGL_FOUND OR AGL_FOUND)
   SET (USE_OPENGL 1)
+  PLUGIN_INCLUDE_DIRECTORIES (${OPENGL_INCLUDE_DIR})
 ENDIF ()
 
 IF (OPENGL_FOUND)

Modified: trunk/platforms/unix/plugins/DBusPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/DBusPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/DBusPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,5 +1,5 @@
 CHECK_INCLUDE_FILE (dbus/dbus.h HAVE_DBUS_DBUS_H)
 
 IF (NOT HAVE_DBUS_DBUS_H)
-    DISABLE_PLUGIN ()
+    PLUGIN_DISABLE ()
 ENDIF (NOT HAVE_DBUS_DBUS_H)

Modified: trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,5 +1,5 @@
 CHECK_INCLUDE_FILE (gst/gst.h HAVE_GST_GST_H)
 
 IF (NOT HAVE_GST_GST_H)
-    DISABLE_PLUGIN ()
+    PLUGIN_DISABLE ()
 ENDIF (NOT HAVE_GST_GST_H)

Modified: trunk/platforms/unix/plugins/HostWindowPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/HostWindowPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/HostWindowPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,3 +1,3 @@
 IF (NOT X11_FOUND)
-    DISABLE_PLUGIN ()
+    PLUGIN_DISABLE ()
 ENDIF (NOT X11_FOUND)

Modified: trunk/platforms/unix/plugins/ImmX11Plugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/ImmX11Plugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/ImmX11Plugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,5 +1,5 @@
 IF (NOT X11_FOUND)
-    DISABLE_PLUGIN ()
+    PLUGIN_DISABLE ()
 ENDIF (NOT X11_FOUND)
 
 CONFIG_DEFINE(USE_XICFONT_OPTION)

Modified: trunk/platforms/unix/plugins/OggPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/OggPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/OggPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -7,5 +7,5 @@
 CHECK_LIBRARY_EXISTS (speex speex_packet_to_header "" HAVE_LIB_SPEEX)
 
 IF (NOT HAVE_VORBIS_CODEC_H OR NOT HAVE_VORBIS_VORBISENC_H OR NOT HAVE_SPEEX_SPEEX_H OR NOT HAVE_LIB_OGG OR NOT HAVE_LIB_VORBIS OR NOT HAVE_LIB_SPEEX)
-    DISABLE_PLUGIN ()
+    PLUGIN_DISABLE ()
 ENDIF ()

Modified: trunk/platforms/unix/plugins/PseudoTTYPlugin/build.cmake
===================================================================
--- trunk/platforms/unix/plugins/PseudoTTYPlugin/build.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/PseudoTTYPlugin/build.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,3 +1 @@
-INCLUDE_DIRECTORIES (${unix}/plugins/AsynchFilePlugin)
-TARGET_LINK_LIBRARIES(@plugin@ ${@plugin@_libs})
 EXPECT_UNDEFINED_SYMBOLS ()

Modified: trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -12,17 +12,19 @@
 IF (NOT HAVE_OPENPTY)
   CHECK_LIBRARY_EXISTS (util openpty "" HAVE_OPENPTY)
   IF (HAVE_OPENPTY)
-    SET (${plugin}_libs util)
+    PLUGIN_LINK_LIBRARIES (util)
   ELSE ()
     IF (EXISTS /dev/ptmx)
       CHECK_FUNCTION_EXISTS (grantpt HAVE_UNIX98_PTYS)
       IF (NOT HAVE_UNIX98_PTYS)
-        DISABLE_PLUGIN ()
+        PLUGIN_DISABLE ()
       ENDIF (NOT HAVE_UNIX98_PTYS)
     ENDIF (EXISTS /dev/ptmx)
   ENDIF (HAVE_OPENPTY)
 ENDIF (NOT HAVE_OPENPTY)
 
+PLUGIN_INCLUDE_DIRECTORIES (${unix}/plugins/AsynchFilePlugin)
+
 CONFIG_DEFINE (HAVE_UTIL_H)
 CONFIG_DEFINE (HAVE_LIBUTIL_H)
 CONFIG_DEFINE (HAVE_PTY_H)

Modified: trunk/platforms/unix/plugins/RomePlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/RomePlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/RomePlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -8,9 +8,9 @@
 ENDIF ()
 
 IF (HAVE_CAIRO_FT_H)
-    SET (${plugin}_include_dirs ${PANGOCAIRO_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS})
-    SET (${plugin}_library_dirs ${PANGOCAIRO_LIBRARY_DIRS} ${FREETYPE_LIBRARY_DIRS})
-    SET (${plugin}_libraries    ${PANGOCAIRO_LIBRARIES} ${FREETYPE_LIBRARIES})
+    PLUGIN_INCLUDE_DIRECTORIES (${PANGOCAIRO_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ${cross}/plugins/SurfacePlugin)
+    PLUGIN_LINK_DIRECTORIES    (${PANGOCAIRO_LIBRARY_DIRS} ${FREETYPE_LIBRARY_DIRS})
+    PLUGIN_LINK_LIBRARIES      (${PANGOCAIRO_LIBRARIES}    ${FREETYPE_LIBRARIES})
 ELSE ()
-    DISABLE_PLUGIN ()
+    PLUGIN_DISABLE ()
 ENDIF ()

Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/build.cmake
===================================================================
--- trunk/platforms/unix/plugins/SqueakFFIPrims/build.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/SqueakFFIPrims/build.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,2 +1 @@
-TARGET_LINK_LIBRARIES (@plugin@ ${@plugin@_libs})
 EXPECT_UNDEFINED_SYMBOLS ()

Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,7 +1,7 @@
 SET (USE_LIBFFI)
 
 IF (OPT_without-ffi)
-  DISABLE_PLUGIN ()
+  PLUGIN_DISABLE ()
 ELSE ()
   IF (${VM_HOST_CPU} STREQUAL "powerpc" OR ${VM_HOST_CPU} STREQUAL "ppc")
     SET (cpu ppc)
@@ -28,13 +28,13 @@
     CHECK_INCLUDE_FILE (ffi.h HAVE_FFI_H)
     CHECK_INCLUDE_FILE (ffi/ffi.h HAVE_FFI_FFI_H)
     IF (NOT HAVE_FFI_H AND NOT HAVE_FFI_FFI_H)
-        DISABLE_PLUGIN ()
+        PLUGIN_DISABLE ()
     ELSE ()
-        SET (${plugin}_libs "ffi")
+        PLUGIN_LINK_LIBRARIES (ffi)
     ENDIF ()
   ENDIF ()
 
-  SET (${plugin}_sources "${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S")
+  PLUGIN_SOURCES ("${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S")
 ENDIF ()
 
 CONFIG_DEFINE (HAVE_FFI_H)

Modified: trunk/platforms/unix/plugins/UUIDPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/UUIDPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/UUIDPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -2,11 +2,11 @@
 CHECK_INCLUDE_FILE (uuid/uuid.h HAVE_UUID_UUID_H)
 
 IF (NOT HAVE_UUID_H AND NOT HAVE_UUID_UUID_H)
-  DISABLE_PLUGIN ()
+  PLUGIN_DISABLE ()
 ELSE ()
   CHECK_LIBRARY_EXISTS (uuid uuid_generate "" HAVE_LIBUUID)
   IF (HAVE_LIBUUID)
-    SET (${plugin}_libs uuid)
+    PLUGIN_LINK_LIBRARIES (uuid)
   ENDIF ()
 ENDIF ()
 

Modified: trunk/platforms/unix/plugins/UnixOSProcessPlugin/build.cmake
===================================================================
--- trunk/platforms/unix/plugins/UnixOSProcessPlugin/build.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/UnixOSProcessPlugin/build.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,3 +1 @@
-INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin)
-ADD_DEFINITIONS (-DSQAIO_H=\"sqaio.h\")
 EXPECT_UNDEFINED_SYMBOLS ()

Modified: trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -2,7 +2,10 @@
 CHECK_LIBRARY_EXISTS (pthread pthread_kill "" HAVE_LIB_PTHREAD)
 
 IF (NOT HAVE_LIB_PTHREAD)
-    DISABLE_PLUGIN ()
+    PLUGIN_DISABLE ()
+ELSE ()
+    PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin)
+    PLUGIN_DEFINITIONS (-DSQAIO_H=\"sqaio.h\")
 ENDIF ()
 
 CONFIG_DEFINE (HAVE_UNSETENV)

Modified: trunk/platforms/unix/plugins/XDisplayControlPlugin/build.cmake
===================================================================
--- trunk/platforms/unix/plugins/XDisplayControlPlugin/build.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/XDisplayControlPlugin/build.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,2 +1 @@
-INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin)
 EXPECT_UNDEFINED_SYMBOLS ()

Modified: trunk/platforms/unix/plugins/XDisplayControlPlugin/config.cmake
===================================================================
--- trunk/platforms/unix/plugins/XDisplayControlPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/plugins/XDisplayControlPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,3 +1,5 @@
 IF (NOT X11_FOUND)
-    DISABLE_PLUGIN ()
+    PLUGIN_DISABLE ()
+ELSE ()
+    PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin)
 ENDIF ()

Modified: trunk/platforms/unix/vm-display-Quartz/build.cmake
===================================================================
--- trunk/platforms/unix/vm-display-Quartz/build.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/vm-display-Quartz/build.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,3 +1 @@
-INCLUDE_DIRECTORIES (${cross}/plugins/B3DAcceleratorPlugin ${AGL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES (@plugin@ ${AGL_LIBRARIES} "-framework Cocoa")
 EXPECT_UNDEFINED_SYMBOLS ()

Modified: trunk/platforms/unix/vm-display-Quartz/config.cmake
===================================================================
--- trunk/platforms/unix/vm-display-Quartz/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/vm-display-Quartz/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,3 +1,6 @@
 IF (NOT APPLE)
-  DISABLE_PLUGIN ()
+  PLUGIN_DISABLE ()
+ELSE ()
+  PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/B3DAcceleratorPlugin ${AGL_INCLUDE_DIR})
+  PLUGIN_LINK_LIBRARIES (${AGL_LIBRARIES} "-framework Cocoa")
 ENDIF (NOT APPLE)

Modified: trunk/platforms/unix/vm-display-X11/build.cmake
===================================================================
--- trunk/platforms/unix/vm-display-X11/build.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/vm-display-X11/build.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,3 +1 @@
-INCLUDE_DIRECTORIES (${cross}/plugins/B3DAcceleratorPlugin ${cross}/plugins/FilePlugin ${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES (@plugin@ ${X11_LIBRARIES} ${OPENGL_LIBRARIES})
 EXPECT_UNDEFINED_SYMBOLS ()

Modified: trunk/platforms/unix/vm-display-X11/config.cmake
===================================================================
--- trunk/platforms/unix/vm-display-X11/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/vm-display-X11/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,7 +1,7 @@
 SET (${plugin}_sources ${unix}/${plugin}/sqUnixX11.c ${unix}/${plugin}/sqUnixMozilla.c)
 
 IF (NOT X11_FOUND)
-  DISABLE_PLUGIN ()
+  PLUGIN_DISABLE ()
 ELSE ()
   SET (USE_X11 1)
   IF (X11_Xext_FOUND)
@@ -19,6 +19,9 @@
       SET (USE_X11_GLX 1)
     ENDIF (HAVE_GL_GL_H AND HAVE_GL_GLX_H)
   ENDIF (OPENGL_FOUND)
+  PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/B3DAcceleratorPlugin ${cross}/plugins/FilePlugin)
+  PLUGIN_INCLUDE_DIRECTORIES (${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+  PLUGIN_LINK_LIBRARIES (${X11_LIBRARIES} ${OPENGL_LIBRARIES})
 ENDIF ()
 
 CONFIG_DEFINE (USE_X11)

Modified: trunk/platforms/unix/vm-display-fbdev/config.cmake
===================================================================
--- trunk/platforms/unix/vm-display-fbdev/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/vm-display-fbdev/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,7 +1,7 @@
 CHECK_INCLUDE_FILE (linux/fb.h HAVE_LINUX_FB_H)
 
 IF (NOT HAVE_LINUX_FB_H)
-  DISABLE_PLUGIN ()
+  PLUGIN_DISABLE ()
 ELSE ()
-  SET (${plugin}_sources ${unix}/${plugin}/sqUnixFBDev.c)
+  PLUGIN_SOURCES (${unix}/${plugin}/sqUnixFBDev.c)
 ENDIF ()

Modified: trunk/platforms/unix/vm-sound-ALSA/config.cmake
===================================================================
--- trunk/platforms/unix/vm-sound-ALSA/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/vm-sound-ALSA/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,4 +1,4 @@
 CHECK_INCLUDE_FILE (alsa/asoundlib.h HAVE_ALSA_ASOUNDLIB_H)
 IF (NOT HAVE_ALSA_ASOUNDLIB_H)
-    DISABLE_PLUGIN()
+    PLUGIN_DISABLE()
 ENDIF ()

Modified: trunk/platforms/unix/vm-sound-MacOSX/config.cmake
===================================================================
--- trunk/platforms/unix/vm-sound-MacOSX/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/vm-sound-MacOSX/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,3 +1,3 @@
 IF (NOT APPLE)
-  DISABLE_PLUGIN ()
+  PLUGIN_DISABLE ()
 ENDIF ()

Modified: trunk/platforms/unix/vm-sound-NAS/config.cmake
===================================================================
--- trunk/platforms/unix/vm-sound-NAS/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/vm-sound-NAS/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,4 +1,4 @@
 CHECK_INCLUDE_FILE (audio/audio.h HAVE_AUDIO_AUDIO_H)
 IF (NOT HAVE_AUDIO_AUDIO_H)
-    DISABLE_PLUGIN ()
+    PLUGIN_DISABLE ()
 ENDIF ()

Modified: trunk/platforms/unix/vm-sound-OSS/config.cmake
===================================================================
--- trunk/platforms/unix/vm-sound-OSS/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/vm-sound-OSS/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -1,5 +1,5 @@
 CHECK_INCLUDE_FILE (alsa/asoundlib.h HAVE_ALSA_ASOUNDLIB_H)
 CHECK_LIBRARY_EXISTS (asound snd_pcm_open "" HAVE_SND_PCM_OPEN)
 IF (NOT HAVE_ALSA_ASOUNDLIB_H OR NOT HAVE_SND_PCM_OPEN)
-    DISABLE_PLUGIN ()
+    PLUGIN_DISABLE ()
 ENDIF ()

Modified: trunk/platforms/unix/vm-sound-Sun/config.cmake
===================================================================
--- trunk/platforms/unix/vm-sound-Sun/config.cmake 2009-08-25 20:53:01 UTC (rev 2083)
+++ trunk/platforms/unix/vm-sound-Sun/config.cmake 2009-08-25 20:54:12 UTC (rev 2084)
@@ -2,5 +2,5 @@
 CHECK_INCLUDE_FILE (sun/audioio.h HAVE_SUN_AUDIOIO_H)
 
 IF (NOT HAVE_SYS_AUDIOIO_H OR NOT HAVE_SUN_AUDIOIO_H)
-    DISABLE_PLUGIN ()
+    PLUGIN_DISABLE ()
 ENDIF ()

Free forum by Nabble Edit this page