From 282f4ce0b968105638e3110cd3c6afa589e0e138 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 19 Mar 2007 17:24:19 +0000
Subject: [PATCH] Moved the TARGET_NAME setting into the OsgMacroUtils.cmake.

---
 CMakeModules/OsgMacroUtils.cmake          | 5 ++++-
 src/osgPlugins/3dc/CMakeLists.txt         | 4 ++--
 src/osgPlugins/3ds/CMakeLists.txt         | 4 ++--
 src/osgPlugins/OpenFlight/CMakeLists.txt  | 4 ++--
 src/osgPlugins/ac/CMakeLists.txt          | 4 ++--
 src/osgPlugins/bmp/CMakeLists.txt         | 4 ++--
 src/osgPlugins/dds/CMakeLists.txt         | 4 ++--
 src/osgPlugins/dw/CMakeLists.txt          | 4 ++--
 src/osgPlugins/dxf/CMakeLists.txt         | 4 ++--
 src/osgPlugins/freetype/CMakeLists.txt    | 4 ++--
 src/osgPlugins/geo/CMakeLists.txt         | 4 ++--
 src/osgPlugins/gif/CMakeLists.txt         | 4 ++--
 src/osgPlugins/hdr/CMakeLists.txt         | 4 ++--
 src/osgPlugins/ive/CMakeLists.txt         | 4 ++--
 src/osgPlugins/jpeg/CMakeLists.txt        | 4 ++--
 src/osgPlugins/lws/CMakeLists.txt         | 4 ++--
 src/osgPlugins/md2/CMakeLists.txt         | 4 ++--
 src/osgPlugins/net/CMakeLists.txt         | 4 ++--
 src/osgPlugins/obj/CMakeLists.txt         | 4 ++--
 src/osgPlugins/osg/CMakeLists.txt         | 4 ++--
 src/osgPlugins/osgFX/CMakeLists.txt       | 4 ++--
 src/osgPlugins/osgParticle/CMakeLists.txt | 4 ++--
 src/osgPlugins/osgShadow/CMakeLists.txt   | 4 ++--
 src/osgPlugins/osgSim/CMakeLists.txt      | 4 ++--
 src/osgPlugins/osgText/CMakeLists.txt     | 4 ++--
 src/osgPlugins/osgViewer/CMakeLists.txt   | 4 ++--
 src/osgPlugins/osga/CMakeLists.txt        | 4 ++--
 src/osgPlugins/osgtgz/CMakeLists.txt      | 4 ++--
 src/osgPlugins/pic/CMakeLists.txt         | 4 ++--
 src/osgPlugins/png/CMakeLists.txt         | 4 ++--
 src/osgPlugins/rgb/CMakeLists.txt         | 4 ++--
 src/osgPlugins/rot/CMakeLists.txt         | 4 ++--
 src/osgPlugins/scale/CMakeLists.txt       | 4 ++--
 src/osgPlugins/shp/CMakeLists.txt         | 4 ++--
 src/osgPlugins/stl/CMakeLists.txt         | 4 ++--
 src/osgPlugins/tga/CMakeLists.txt         | 4 ++--
 src/osgPlugins/tgz/CMakeLists.txt         | 4 ++--
 src/osgPlugins/tiff/CMakeLists.txt        | 4 ++--
 src/osgPlugins/trans/CMakeLists.txt       | 4 ++--
 src/osgPlugins/txf/CMakeLists.txt         | 4 ++--
 src/osgPlugins/x/CMakeLists.txt           | 4 ++--
 src/osgPlugins/zip/CMakeLists.txt         | 4 ++--
 42 files changed, 86 insertions(+), 83 deletions(-)

diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
index 682033c8f..faa849dab 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -44,7 +44,10 @@ ENDMACRO(SETUP_LINK_LIBRARIES)
 # this is the common set of command for all the plugins
 #
 
-MACRO(SETUP_PLUGIN)
+MACRO(SETUP_PLUGIN PLUGIN_NAME)
+
+        SET(TARGET_NAME ${PLUGIN_NAME} )
+
 	#MESSAGE("in -->SETUP_PLUGIN<-- ${TARGET_NAME}-->${TARGET_SRC} <--> ${TARGET_H}<--")
 
 	## we have set up the target label and targetname by taking into account global prfix (osgdb_)
diff --git a/src/osgPlugins/3dc/CMakeLists.txt b/src/osgPlugins/3dc/CMakeLists.txt
index b5b203b46..5871f993c 100644
--- a/src/osgPlugins/3dc/CMakeLists.txt
+++ b/src/osgPlugins/3dc/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME 3dc )
+
 SET(TARGET_SRC ReaderWriter3DC.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(3dc)
diff --git a/src/osgPlugins/3ds/CMakeLists.txt b/src/osgPlugins/3ds/CMakeLists.txt
index 17da34635..3201c7720 100644
--- a/src/osgPlugins/3ds/CMakeLists.txt
+++ b/src/osgPlugins/3ds/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME 3ds )
+
 SET(TARGET_SRC
 ReaderWriter3DS.cpp
 atmosphere.cpp
@@ -48,4 +48,4 @@ vector.h
 viewport.h
 )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(3ds)
diff --git a/src/osgPlugins/OpenFlight/CMakeLists.txt b/src/osgPlugins/OpenFlight/CMakeLists.txt
index 6e708e136..5e581dce8 100644
--- a/src/osgPlugins/OpenFlight/CMakeLists.txt
+++ b/src/osgPlugins/OpenFlight/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME OpenFlight )
+
 SET(TARGET_SRC
 AncillaryRecords.cpp
 AttrData.cpp
@@ -36,4 +36,4 @@ types.h
 )
 SET(TARGET_ADDED_LIBRARIES osgSim )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(OpenFlight)
diff --git a/src/osgPlugins/ac/CMakeLists.txt b/src/osgPlugins/ac/CMakeLists.txt
index e63f89e6f..73552b297 100644
--- a/src/osgPlugins/ac/CMakeLists.txt
+++ b/src/osgPlugins/ac/CMakeLists.txt
@@ -1,7 +1,7 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME ac )
+
 SET(TARGET_SRC Exception.cpp Geode.cpp ac3d.cpp )
 SET(TARGET_H Exception.h Geode.h )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(ac)
diff --git a/src/osgPlugins/bmp/CMakeLists.txt b/src/osgPlugins/bmp/CMakeLists.txt
index 60769d016..5847bab9a 100644
--- a/src/osgPlugins/bmp/CMakeLists.txt
+++ b/src/osgPlugins/bmp/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME bmp )
+
 SET(TARGET_SRC ReaderWriterBMP.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(bmp)
diff --git a/src/osgPlugins/dds/CMakeLists.txt b/src/osgPlugins/dds/CMakeLists.txt
index ddf055bc8..672c21451 100644
--- a/src/osgPlugins/dds/CMakeLists.txt
+++ b/src/osgPlugins/dds/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME dds )
+
 SET(TARGET_SRC ReaderWriterDDS.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(dds)
diff --git a/src/osgPlugins/dw/CMakeLists.txt b/src/osgPlugins/dw/CMakeLists.txt
index 7925c7eb2..983fb2c13 100644
--- a/src/osgPlugins/dw/CMakeLists.txt
+++ b/src/osgPlugins/dw/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME dw )
+
 SET(TARGET_SRC ReaderWriterDW.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(dw)
diff --git a/src/osgPlugins/dxf/CMakeLists.txt b/src/osgPlugins/dxf/CMakeLists.txt
index efceaa9b2..b409856d6 100644
--- a/src/osgPlugins/dxf/CMakeLists.txt
+++ b/src/osgPlugins/dxf/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME dxf )
+
 SET(TARGET_SRC
 ReaderWriterDXF.cpp
 aci.cpp
@@ -26,4 +26,4 @@ dxfTable.h
 scene.h
 )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(dxf)
diff --git a/src/osgPlugins/freetype/CMakeLists.txt b/src/osgPlugins/freetype/CMakeLists.txt
index 261457125..aa9eeed0c 100644
--- a/src/osgPlugins/freetype/CMakeLists.txt
+++ b/src/osgPlugins/freetype/CMakeLists.txt
@@ -6,10 +6,10 @@
   ENDIF(WIN32)
   INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS} )
 
-SET(TARGET_NAME freetype )
+
 SET(TARGET_SRC FreeTypeFont.cpp FreeTypeLibrary.cpp ReaderWriterFreeType.cpp )
 SET(TARGET_H FreeTypeFont.h FreeTypeLibrary.h )
 SET(TARGET_ADDED_LIBRARIES osgText )
 SET(TARGET_EXTERNAL_LIBRARIES ${FREETYPE_LIBRARY} )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(freetype)
diff --git a/src/osgPlugins/geo/CMakeLists.txt b/src/osgPlugins/geo/CMakeLists.txt
index 9f928ee25..dbbf23a42 100644
--- a/src/osgPlugins/geo/CMakeLists.txt
+++ b/src/osgPlugins/geo/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME geo )
+
 SET(TARGET_SRC ClipRegion.cpp ReaderWriterGEO.cpp geoActions.cpp )
 SET(TARGET_H
 ClipRegion.h
@@ -16,4 +16,4 @@ osgGeoStructs.h
 )
 SET(TARGET_ADDED_LIBRARIES osgSim )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(geo)
diff --git a/src/osgPlugins/gif/CMakeLists.txt b/src/osgPlugins/gif/CMakeLists.txt
index 395a2dc6f..8344151ce 100644
--- a/src/osgPlugins/gif/CMakeLists.txt
+++ b/src/osgPlugins/gif/CMakeLists.txt
@@ -4,11 +4,11 @@
 	INCLUDE_DIRECTORIES( ${GIFLIB_INCLUDE_DIR} )
 	LINK_DIRECTORIES( ${GIFLIB_DIR}/lib )
 
-SET(TARGET_NAME gif )
+
 SET(TARGET_SRC ReaderWriterGIF.cpp )
 SET(TARGET_EXTERNAL_LIBRARIES ${GIFLIB_LIBRARY} )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(gif)
 
 IF(MSVC)
 	SET_TARGET_PROPERTIES("${TARGET_DEFAULT_PREFIX}${TARGET_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
diff --git a/src/osgPlugins/hdr/CMakeLists.txt b/src/osgPlugins/hdr/CMakeLists.txt
index 63e766367..84c195ebb 100644
--- a/src/osgPlugins/hdr/CMakeLists.txt
+++ b/src/osgPlugins/hdr/CMakeLists.txt
@@ -1,7 +1,7 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME hdr )
+
 SET(TARGET_SRC ReaderWriterHDR.cpp hdrloader.cpp )
 SET(TARGET_H hdrloader.h )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(hdr)
diff --git a/src/osgPlugins/ive/CMakeLists.txt b/src/osgPlugins/ive/CMakeLists.txt
index 1c84ec726..7674a9640 100644
--- a/src/osgPlugins/ive/CMakeLists.txt
+++ b/src/osgPlugins/ive/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME ive )
+
 SET(TARGET_SRC
 AlphaFunc.cpp
 AnimationPath.cpp
@@ -193,4 +193,4 @@ VisibilityGroup.h
 )
 SET(TARGET_ADDED_LIBRARIES osgSim osgFX osgText )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(ive)
diff --git a/src/osgPlugins/jpeg/CMakeLists.txt b/src/osgPlugins/jpeg/CMakeLists.txt
index 22bc20bbc..0e985bb8c 100644
--- a/src/osgPlugins/jpeg/CMakeLists.txt
+++ b/src/osgPlugins/jpeg/CMakeLists.txt
@@ -4,8 +4,8 @@
 	INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} )
 	LINK_DIRECTORIES( ${JPEG_DIR}/lib )
 
-SET(TARGET_NAME jpeg )
+
 SET(TARGET_SRC ReaderWriterJPEG.cpp )
 SET(TARGET_EXTERNAL_LIBRARIES ${JPEG_LIBRARY} )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(jpeg)
diff --git a/src/osgPlugins/lws/CMakeLists.txt b/src/osgPlugins/lws/CMakeLists.txt
index 08c536e15..aa5832be8 100644
--- a/src/osgPlugins/lws/CMakeLists.txt
+++ b/src/osgPlugins/lws/CMakeLists.txt
@@ -1,7 +1,7 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME lws )
+
 SET(TARGET_SRC ReaderWriterLWS.cpp SceneLoader.cpp )
 SET(TARGET_H SceneLoader.h )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(lws)
diff --git a/src/osgPlugins/md2/CMakeLists.txt b/src/osgPlugins/md2/CMakeLists.txt
index 8eba6bd65..68fe965e2 100644
--- a/src/osgPlugins/md2/CMakeLists.txt
+++ b/src/osgPlugins/md2/CMakeLists.txt
@@ -1,7 +1,7 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME md2 )
+
 SET(TARGET_SRC ReaderWriterMD2.cpp )
 SET(TARGET_H anorms.h )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(md2)
diff --git a/src/osgPlugins/net/CMakeLists.txt b/src/osgPlugins/net/CMakeLists.txt
index b59231a28..8e53c9fbe 100644
--- a/src/osgPlugins/net/CMakeLists.txt
+++ b/src/osgPlugins/net/CMakeLists.txt
@@ -1,8 +1,8 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME net )
+
 SET(TARGET_SRC ReaderWriterNET.cpp sockinet.cpp sockstream.cpp )
 SET(TARGET_H sockinet.h sockstream.h )
 SET(TARGET_EXTERNAL_LIBRARIES ${OSG_SOCKET_LIBS} )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(net)
diff --git a/src/osgPlugins/obj/CMakeLists.txt b/src/osgPlugins/obj/CMakeLists.txt
index 15cb619b7..4a5648bd5 100644
--- a/src/osgPlugins/obj/CMakeLists.txt
+++ b/src/osgPlugins/obj/CMakeLists.txt
@@ -1,7 +1,7 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME obj )
+
 SET(TARGET_SRC ReaderWriterOBJ.cpp obj.cpp )
 SET(TARGET_H obj.h )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(obj)
diff --git a/src/osgPlugins/osg/CMakeLists.txt b/src/osgPlugins/osg/CMakeLists.txt
index 751dcb4bc..b8d08f779 100644
--- a/src/osgPlugins/osg/CMakeLists.txt
+++ b/src/osgPlugins/osg/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME osg )
+
 SET(TARGET_SRC
 AlphaFunc.cpp
 AnimationPath.cpp
@@ -82,4 +82,4 @@ Viewport.cpp
 SET(TARGET_H Matrix.h )
 SET(TARGET_ADDED_LIBRARIES osgSim osgFX osgText )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(osg)
diff --git a/src/osgPlugins/osgFX/CMakeLists.txt b/src/osgPlugins/osgFX/CMakeLists.txt
index b3cd31c15..d8a5c1e1b 100644
--- a/src/osgPlugins/osgFX/CMakeLists.txt
+++ b/src/osgPlugins/osgFX/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME osgFX )
+
 SET(TARGET_SRC
 IO_AnisotropicLighting.cpp
 IO_BumpMapping.cpp
@@ -12,4 +12,4 @@ IO_SpecularHighlights.cpp
 )
 SET(TARGET_ADDED_LIBRARIES osgFX )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(osgFX)
diff --git a/src/osgPlugins/osgParticle/CMakeLists.txt b/src/osgPlugins/osgParticle/CMakeLists.txt
index 282074686..124828046 100644
--- a/src/osgPlugins/osgParticle/CMakeLists.txt
+++ b/src/osgPlugins/osgParticle/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME osgParticle )
+
 SET(TARGET_SRC
 IO_AccelOperator.cpp
 IO_AngularAccelOperator.cpp
@@ -35,4 +35,4 @@ IO_VariableRateCounter.cpp
 )
 SET(TARGET_ADDED_LIBRARIES osgParticle )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(osgParticle)
diff --git a/src/osgPlugins/osgShadow/CMakeLists.txt b/src/osgPlugins/osgShadow/CMakeLists.txt
index a333b6e95..d15fa32b3 100644
--- a/src/osgPlugins/osgShadow/CMakeLists.txt
+++ b/src/osgPlugins/osgShadow/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(TARGET_NAME osgShadow )
+
 SET(TARGET_SRC 
     ParallelSplitShadowMap.cpp
     ReaderWriterOsgShadow.cpp
@@ -11,4 +11,4 @@ SET(TARGET_SRC
 SET(TARGET_ADDED_LIBRARIES osgShadow )
 
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(osgShadow)
diff --git a/src/osgPlugins/osgSim/CMakeLists.txt b/src/osgPlugins/osgSim/CMakeLists.txt
index 74e6ab6f1..b972588a2 100644
--- a/src/osgPlugins/osgSim/CMakeLists.txt
+++ b/src/osgPlugins/osgSim/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME osgSim )
+
 SET(TARGET_SRC
 IO_BlinkSequence.cpp
 IO_DOFTransform.cpp
@@ -14,4 +14,4 @@ IO_VisibilityGroup.cpp
 SET(TARGET_H IO_LightPoint.h )
 SET(TARGET_ADDED_LIBRARIES osgSim )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(osgSim)
diff --git a/src/osgPlugins/osgText/CMakeLists.txt b/src/osgPlugins/osgText/CMakeLists.txt
index 8d46c32c8..289491715 100644
--- a/src/osgPlugins/osgText/CMakeLists.txt
+++ b/src/osgPlugins/osgText/CMakeLists.txt
@@ -1,7 +1,7 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME osgText )
+
 SET(TARGET_SRC IO_Text.cpp )
 SET(TARGET_ADDED_LIBRARIES osgText )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(osgText)
diff --git a/src/osgPlugins/osgViewer/CMakeLists.txt b/src/osgPlugins/osgViewer/CMakeLists.txt
index 34b9415f1..aabd64eb6 100644
--- a/src/osgPlugins/osgViewer/CMakeLists.txt
+++ b/src/osgPlugins/osgViewer/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(TARGET_NAME osgViewer )
+
 SET(TARGET_SRC 
     View.cpp 
     ReaderWriterOsgViewer.cpp 
@@ -6,4 +6,4 @@ SET(TARGET_SRC
 SET(TARGET_ADDED_LIBRARIES osgViewer )
 
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(osgViewer)
diff --git a/src/osgPlugins/osga/CMakeLists.txt b/src/osgPlugins/osga/CMakeLists.txt
index c40d3c65d..4fed178e1 100644
--- a/src/osgPlugins/osga/CMakeLists.txt
+++ b/src/osgPlugins/osga/CMakeLists.txt
@@ -1,7 +1,7 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME osga )
+
 SET(TARGET_SRC OSGA_Archive.cpp ReaderWriterOSGA.cpp )
 SET(TARGET_H OSGA_Archive.h )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(osga)
diff --git a/src/osgPlugins/osgtgz/CMakeLists.txt b/src/osgPlugins/osgtgz/CMakeLists.txt
index 9ced6698e..fb1d1dc59 100644
--- a/src/osgPlugins/osgtgz/CMakeLists.txt
+++ b/src/osgPlugins/osgtgz/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME osgtgz )
+
 SET(TARGET_SRC ReaderWriterOSGTGZ.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(osgtgz)
diff --git a/src/osgPlugins/pic/CMakeLists.txt b/src/osgPlugins/pic/CMakeLists.txt
index 7144600b5..57681366a 100644
--- a/src/osgPlugins/pic/CMakeLists.txt
+++ b/src/osgPlugins/pic/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME pic )
+
 SET(TARGET_SRC ReaderWriterPIC.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(pic)
diff --git a/src/osgPlugins/png/CMakeLists.txt b/src/osgPlugins/png/CMakeLists.txt
index d76d2c0f0..5fc72b8fc 100644
--- a/src/osgPlugins/png/CMakeLists.txt
+++ b/src/osgPlugins/png/CMakeLists.txt
@@ -4,11 +4,11 @@
 INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
 LINK_DIRECTORIES( ${ZLIB_DIR}/lib ${PNG_DIR}/lib )
 
-SET(TARGET_NAME png )
+
 SET(TARGET_SRC ReaderWriterPNG.cpp )
 SET(TARGET_EXTERNAL_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY} )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(png)
 
 IF(MSVC)
 	SET_TARGET_PROPERTIES("${TARGET_DEFAULT_PREFIX}${TARGET_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
diff --git a/src/osgPlugins/rgb/CMakeLists.txt b/src/osgPlugins/rgb/CMakeLists.txt
index 06ff12c0d..b0750ae50 100644
--- a/src/osgPlugins/rgb/CMakeLists.txt
+++ b/src/osgPlugins/rgb/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME rgb )
+
 SET(TARGET_SRC ReaderWriterRGB.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(rgb)
diff --git a/src/osgPlugins/rot/CMakeLists.txt b/src/osgPlugins/rot/CMakeLists.txt
index cd57800b2..1a0496694 100644
--- a/src/osgPlugins/rot/CMakeLists.txt
+++ b/src/osgPlugins/rot/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME rot )
+
 SET(TARGET_SRC ReaderWriterROT.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(rot)
diff --git a/src/osgPlugins/scale/CMakeLists.txt b/src/osgPlugins/scale/CMakeLists.txt
index 6b280cb3d..5ee5f6abc 100644
--- a/src/osgPlugins/scale/CMakeLists.txt
+++ b/src/osgPlugins/scale/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME scale )
+
 SET(TARGET_SRC ReaderWriterSCALE.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(scale)
diff --git a/src/osgPlugins/shp/CMakeLists.txt b/src/osgPlugins/shp/CMakeLists.txt
index 98f8e5603..d7d15c984 100644
--- a/src/osgPlugins/shp/CMakeLists.txt
+++ b/src/osgPlugins/shp/CMakeLists.txt
@@ -1,7 +1,7 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME shp )
+
 SET(TARGET_SRC ESRIShape.cpp ESRIShapeParser.cpp ESRIShapeReaderWriter.cpp )
 SET(TARGET_H ESRIShape.h ESRIShapeParser.h )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(shp)
diff --git a/src/osgPlugins/stl/CMakeLists.txt b/src/osgPlugins/stl/CMakeLists.txt
index d62bbf6d2..b73045042 100644
--- a/src/osgPlugins/stl/CMakeLists.txt
+++ b/src/osgPlugins/stl/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME stl )
+
 SET(TARGET_SRC ReaderWriterSTL.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(stl)
diff --git a/src/osgPlugins/tga/CMakeLists.txt b/src/osgPlugins/tga/CMakeLists.txt
index e6657c171..660e5c496 100644
--- a/src/osgPlugins/tga/CMakeLists.txt
+++ b/src/osgPlugins/tga/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME tga )
+
 SET(TARGET_SRC ReaderWriterTGA.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(tga)
diff --git a/src/osgPlugins/tgz/CMakeLists.txt b/src/osgPlugins/tgz/CMakeLists.txt
index e354919b6..40dc8f27d 100644
--- a/src/osgPlugins/tgz/CMakeLists.txt
+++ b/src/osgPlugins/tgz/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME tgz )
+
 SET(TARGET_SRC ReaderWriterTGZ.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(tgz)
diff --git a/src/osgPlugins/tiff/CMakeLists.txt b/src/osgPlugins/tiff/CMakeLists.txt
index 1ef746797..7ac5443db 100644
--- a/src/osgPlugins/tiff/CMakeLists.txt
+++ b/src/osgPlugins/tiff/CMakeLists.txt
@@ -4,8 +4,8 @@
 	INCLUDE_DIRECTORIES( ${TIFF_INCLUDE_DIR} )
 	LINK_DIRECTORIES( ${TIFF_DIR}/lib )
 
-SET(TARGET_NAME tiff )
+
 SET(TARGET_SRC ReaderWriterTIFF.cpp )
 SET(TARGET_EXTERNAL_LIBRARIES ${TIFF_LIBRARY} )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(tiff)
diff --git a/src/osgPlugins/trans/CMakeLists.txt b/src/osgPlugins/trans/CMakeLists.txt
index 3a5c3986d..4415c5e3c 100644
--- a/src/osgPlugins/trans/CMakeLists.txt
+++ b/src/osgPlugins/trans/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME trans )
+
 SET(TARGET_SRC ReaderWriterTRANS.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(trans)
diff --git a/src/osgPlugins/txf/CMakeLists.txt b/src/osgPlugins/txf/CMakeLists.txt
index 0f5a85f33..bb2e48283 100644
--- a/src/osgPlugins/txf/CMakeLists.txt
+++ b/src/osgPlugins/txf/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(TARGET_NAME txf )
+
 SET(TARGET_SRC 
     ReaderWriterTXF.cpp
     TXFFont.cpp
@@ -9,4 +9,4 @@ SET(TARGET_H
 SET(TARGET_ADDED_LIBRARIES osgText )
 
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(txf)
diff --git a/src/osgPlugins/x/CMakeLists.txt b/src/osgPlugins/x/CMakeLists.txt
index 7e01c9553..bb5811010 100644
--- a/src/osgPlugins/x/CMakeLists.txt
+++ b/src/osgPlugins/x/CMakeLists.txt
@@ -1,7 +1,7 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME x )
+
 SET(TARGET_SRC ReaderWriterDirectX.cpp directx.cpp mesh.cpp types.cpp )
 SET(TARGET_H directx.h mesh.h types.h )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(x)
diff --git a/src/osgPlugins/zip/CMakeLists.txt b/src/osgPlugins/zip/CMakeLists.txt
index 012ec23b2..7a65e7412 100644
--- a/src/osgPlugins/zip/CMakeLists.txt
+++ b/src/osgPlugins/zip/CMakeLists.txt
@@ -1,6 +1,6 @@
 #this file is automatically generated 
 
-SET(TARGET_NAME zip )
+
 SET(TARGET_SRC ReaderWriterZIP.cpp )
 #### end var setup  ###
-SETUP_PLUGIN()
+SETUP_PLUGIN(zip)