Moved the TARGET_NAME setting into the OsgMacroUtils.cmake.

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_)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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")

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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")

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)