From Luigi Calori, move to using local CMakeLists.txt files and explicit file lists.

From Robert Osfield, small ammendments of the above to seperate example and application installs, and fix the osgPlugins install directory.

CMakeLists.txt

@@ -181,6 +181,7 @@ ELSE (DYNAMIC_OPENSCENEGRAPH)
 	SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC")
 ENDIF(DYNAMIC_OPENSCENEGRAPH)
 
+INCLUDE(OsgMacroUtils)
 # OSG Core
 ADD_SUBDIRECTORY(src)
 

CMakeModules/OsgMacroUtils.cmake

@@ -1,283 +1,119 @@
-INCLUDE(UtilityMacros)
+#######################################################################################################
-#---------------------------------------------------
+#  macro for common setup of plugins, examples and applications it expect some variables to be set:
-# ADD_OSG_LIB ( SUBDIR )
+#  either within the local CMakeLists or higher in hierarchy
-# collects source files from given subdir and generates a shared library from them
+#  TARGET_NAME is the name of the folder and of the actually .exe or .so or .dll
-# additional parameters specify symbols, link libraries and omited files 
+#  TARGET_TARGETNAME  is the name of the target , this get buit out of a prefix, if present and TARGET_TARGETNAME
-# begin these with keyword DEFINE LINK or EXCLUDE
+#  TARGET_SRC  are the sources of the target
-# e.g. ADD_OSG_LIB( osgDB DEFINE OSGDB_EXPORT LINK osg EXCLUDE osg_mac.cxx ) 
+#  TARGET_H are the eventual headers of the target
-# if OSG_PROJECT_LABEL_PREFIX is defined the project label is augmented with prefix
+#  TARGET_LIBRARIES are the libraries to link to that are internal to the project and have d suffix for debug
-#---------------------------------------------------
+#  TARGET_EXTERNAL_LIBRARIES are external libraries and are not differentiated with d suffix
+#  TARGET_LABEL is the label IDE should show up for targets
+##########################################################################################################
 
-MACRO(ADD_OSG_LIB SUBDIR EXPORTDEF)
+MACRO(SETUP_LINK_LIBRARIES)
-	#MESSAGE(STATUS "=== ADD_OSG_LIB ${SUBDIR}")
+######################################################################
-	MACRO_MESSAGE("---source dir -->${OPENSCENEGRAPH_DIR}/src/${SUBDIR}<---")
+#
+# This set up the libraries to link to, it assumes there are two variable: one common for a group of examples or plagins
+# kept in the variable TARGET_COMMON_LIBRARIES and an example or plugin specific kept in TARGET_ADDED_LIBRARIES 
+# they are combined in a single list checked for unicity 
+# the suffix ${CMAKE_DEBUG_POSTFIX} is used for differentiating optimized and debug
+#
+# a second variable TARGET_EXTERNAL_LIBRARIES hold the list of  libraries not differentiated between debug and optimized 
+##################################################################################
+	SET(TARGET_LIBRARIES ${TARGET_COMMON_LIBRARIES})
+	FOREACH(LINKLIB ${TARGET_ADDED_LIBRARIES})
+  	SET(TO_INSERT TRUE)
+  	FOREACH (value ${TARGET_COMMON_LIBRARIES})
+    	IF (${value} STREQUAL ${LINKLIB})
+      	SET(TO_INSERT FALSE)
+    	ENDIF (${value} STREQUAL ${LINKLIB})
+  	ENDFOREACH (value ${TARGET_COMMON_LIBRARIES})
+  	IF(TO_INSERT)
+  		LIST(APPEND TARGET_LIBRARIES ${LINKLIB})
+  	ENDIF(TO_INSERT)
+	ENDFOREACH(LINKLIB)
+	FOREACH(LINKLIB ${TARGET_LIBRARIES})
+		TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
+	ENDFOREACH(LINKLIB)
+	FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES})
+		TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB})
+	ENDFOREACH(LINKLIB)
+ENDMACRO(SETUP_LINK_LIBRARIES)
 
-	SET(TARGET_NAME ${SUBDIR})
+############################################################################################
-	FILE(GLOB SRC_FILES ${OPENSCENEGRAPH_DIR}/src/${SUBDIR}/*.cpp)
+# this is the common set of command for all the plugins
-	#FILE(GLOB H_FILES ${OPENSCENEGRAPH_DIR}/include/${SUBDIR}/*)
+#
-	GET_HEADERS_EXTENSIONLESS("${OPENSCENEGRAPH_DIR}/include/${SUBDIR}" "*" H_FILES)
-#patch luigi osgwrapper	FILE(GLOB SRC_FILES_SUB ${OPENSCENEGRAPH_DIR}/src/${SUBDIR}/*/*.cpp)
-#patch luigi osgwrapper	SET(SRC_FILES ${SRC_FILES} ${SRC_FILES_SUB})
-	
-	#-- extract link files, defines, exclude files form additional arguments 
-	
-	SET(LISTNAME "TEMP")
-	SET(DEFSTR "")
-	
-	#--- parse remaining args
-	FOREACH(ARG ${ARGN})					 
-		#MESSAGE(STATUS "+ [${ARG}]")
-		
-		# if we find our keywords set the active list to given keyname 
-		STRING(COMPARE EQUAL "${ARG}" "LINK" IS_LINK)
-		STRING(COMPARE EQUAL "${ARG}" "DEFINE" IS_DEFINE)
-		STRING(COMPARE EQUAL "${ARG}" "EXCLUDE" IS_EXCLUDE)
-		
-		#MESSAGE(STATUS "STRSTUFF L ${IS_LINK} D ${IS_DEFINE} E ${IS_EXCLUDE}")
-		
-		#--- check for label change 
-		SET(LIST_CHANGED ${IS_LINK} OR ${IS_DEFINE} OR ${IS_EXCLUDE})
-		IF(${LIST_CHANGED})
-			SET(${LISTNAME} ${CURRLIST})				# in this case change the current list 
-			#MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})")
-			SET(LISTNAME ${ARG})								# new list name 
-			REMOVE(CURRLIST ${CURRLIST} ) 			# clear current list 
-		ELSE(${LIST_CHANGED})
-			SET(CURRLIST ${CURRLIST} ${ARG})		# otherwise just add current entry to current list 
-		ENDIF(${LIST_CHANGED})
-		
-	ENDFOREACH(ARG)
-	SET(${LISTNAME} ${CURRLIST})						# copy current list to active list
-	#MESSAGE(STATUS "STORED LIST [${LISTNAME}] = (${CURRLIST})")
-	REMOVE(CURRLIST ${CURRLIST} )						# clear current list 
-	
-	#MESSAGE(STATUS "AFTER: EXC (${EXCLUDE}) DEF (${DEFINE}) LINK (${LINK})")
-	
-	#--- exclude files from exclude list 
-	FOREACH(EXF ${EXCLUDE})
-		REMOVE(SRC_FILES ${OPENSCENEGRAPH_DIR}/src/${SUBDIR}/${EXF})
-	ENDFOREACH(EXF)
-	
-	SOURCE_GROUP("Header Files" FILES ${H_FILES})
-	SET_SOURCE_FILES_PROPERTIES(${H_FILES} PROPERTIES HEADER_FILE_ONLY ON)
-	
-	#--- add symbols, first assemble string with multiple /D "symbol" entries
-	FOREACH(DEF ${DEFINE})
-		IF(WIN32)
-			SET(DEFSTR "${DEFSTR} /D \"${DEF}\"")
-			#MESSAGE(STATUS "add symbol : " ${DEF})
-		ENDIF(WIN32)
-		IF(UNIX)
-			SET(DEFSTR "${DEFSTR} -D\"${DEF}\"")
-			#MESSAGE(STATUS "add symbol : " ${DEF})
-		ENDIF(UNIX)
-	ENDFOREACH(DEF)
-	
-	IF(NOT DEFSTR STREQUAL "")	# then set defines 
-		SET_SOURCE_FILES_PROPERTIES(${SRC_FILES} PROPERTIES COMPILE_FLAGS ${DEFSTR})
-		#MESSAGE(STATUS "*********  ADD COMPILE FLAGS ${DEFSTR} **********")
-	ENDIF(NOT DEFSTR STREQUAL "")
-	
-	#--- add library with given name 
-	ADD_LIBRARY(${TARGET_NAME} SHARED ${SRC_FILES} ${H_FILES})
-	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES DEFINE_SYMBOL "${EXPORTDEF}" PROJECT_LABEL "${OSG_PROJECT_LABEL_PREFIX} ${TARGET_NAME}")
-	
-	TARGET_LINK_LIBRARIES(${TARGET_NAME} ${LINK})
 
-	#speed#TARGET_LOCATIONS_ACCUM(${TARGET_NAME})
+MACRO(SETUP_PLUGIN)
+	#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_)
+
+	IF(NOT TARGET_TARGETNAME)
+			SET(TARGET_TARGETNAME "${TARGET_DEFAULT_PREFIX}${TARGET_NAME}")
+	ENDIF(NOT TARGET_TARGETNAME)
+	IF(NOT TARGET_LABEL)
+			SET(TARGET_LABEL "${TARGET_DEFAULT_LABEL_PREFIX} ${TARGET_NAME}")
+	ENDIF(NOT TARGET_LABEL)
 	
-	REMOVE(DEFINE ${DEFINE})	
+# here we use the command to generate the library	
-	REMOVE(LINK ${LINK})	
-	REMOVE(EXCLUDE ${EXCLUDE})	
 	
-	#old form# INSTALL_TARGETS(/lib ${TARGET_NAME} )
+	ADD_LIBRARY(${TARGET_TARGETNAME} MODULE ${TARGET_SRC} ${TARGET_H})
-	INSTALL(TARGETS ${TARGET_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin )
-	INSTALL(FILES ${H_FILES} DESTINATION include/${TARGET_NAME} )
 	
-ENDMACRO(ADD_OSG_LIB)
+	#not sure if needed, but for plugins only msvc need the d suffix
-
-
-
-MACRO(ADD_OSG_APPLICATION  SUBDIR)
-	#PROJECT("application_${SUBDIR}")
-  SET(MYTARGET application_${SUBDIR})
-	FILE(GLOB APPLICATION_SRC ${OPENSCENEGRAPH_APPLICATION_DIR}/${SUBDIR}/*.cpp)
-	FILE(GLOB APPLICATION_H ${OPENSCENEGRAPH_APPLICATION_DIR}/${SUBDIR}/*.h)
-	IF(NOT APPLICATION_SRC)
-		MESSAGE("application_${SUBDIR}")
-	ELSE(NOT APPLICATION_SRC)
-	ADD_EXECUTABLE(${MYTARGET} ${APPLICATION_SRC} ${APPLICATION_H})
-	ENDIF(NOT APPLICATION_SRC)
-	SET_TARGET_PROPERTIES(${MYTARGET} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
-	SET_TARGET_PROPERTIES(${MYTARGET} PROPERTIES OUTPUT_NAME ${SUBDIR})
-	#IF(UNIX)
-	#	MESSAGE("so no qui!!!!!!!!!!")
-		FOREACH(LINKLIB osg osgDB osgUtil osgViewer osgText osgGA OpenThreads  ${ARGV1} ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5})
-			IF(${LINKLIB} MATCHES "osg")	
-				#MESSAGE("TARGET_LINK_LIBRARIES(${MYTARGET} ${LINKLIB}")
-				TARGET_LINK_LIBRARIES(${MYTARGET} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-			ELSE(${LINKLIB} MATCHES "osg")	
-			 IF(${LINKLIB} MATCHES "Producer")	
-				#MESSAGE("TARGET_LINK_LIBRARIES(${MYTARGET} ${LINKLIB}")
-				TARGET_LINK_LIBRARIES(${MYTARGET} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-			 ELSE(${LINKLIB} MATCHES "Producer")	
-			  IF(${LINKLIB} MATCHES "OpenThreads")	
-				#MESSAGE("TARGET_LINK_LIBRARIES(${MYTARGET} ${LINKLIB}")
-				IF(MSVC)
-#change in name from standar VS projects					TARGET_LINK_LIBRARIES(${MYTARGET} optimized "${LINKLIB}Win32" debug "${LINKLIB}Win32d" )
-					TARGET_LINK_LIBRARIES(${MYTARGET} optimized "${LINKLIB}" debug "${LINKLIB}d" )
-				ELSE(MSVC)	
-				  TARGET_LINK_LIBRARIES(${MYTARGET} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-        			ENDIF(MSVC)
-			  ELSE(${LINKLIB} MATCHES "OpenThreads")	
-				#MESSAGE("EXTERNAL LIB:TARGET_LINK_LIBRARIES(${MYTARGET} ${LINKLIB}")
-				TARGET_LINK_LIBRARIES(${MYTARGET} ${LINKLIB} )
-			  ENDIF(${LINKLIB} MATCHES "OpenThreads")	
-			 ENDIF(${LINKLIB} MATCHES "Producer")	
-			ENDIF(${LINKLIB} MATCHES "osg")	
-		ENDFOREACH(LINKLIB)
-	#ELSE(UNIX)
-	#	TARGET_LINK_LIBRARIES(${MYTARGET} osg osgDB osgUtil osgProducer ${ARGV1} ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5})
-	#ENDIF(UNIX)
-	SET_TARGET_PROPERTIES(${MYTARGET} PROPERTIES PROJECT_LABEL "application ${SUBDIR}")
-	#speed#TARGET_LOCATIONS_ACCUM(${MYTARGET})
-	#MESSAGE(STATUS "adding osg application ${MYTARGET}")
-	
-	##INSTALL_TARGETS(/bin ${MYTARGET} )
-	INSTALL(TARGETS ${MYTARGET} RUNTIME DESTINATION bin  )			
-ENDMACRO(ADD_OSG_APPLICATION)
-
-MACRO(ADD_OSG_EXAMPLE  SUBDIR)
-	#PROJECT("example_${SUBDIR}")
-  SET(MYTARGET example_${SUBDIR})
-	FILE(GLOB EXAMPLE_SRC ${OPENSCENEGRAPH_EXAMPLE_DIR}/${SUBDIR}/*.cpp)
-	FILE(GLOB EXAMPLE_H ${OPENSCENEGRAPH_EXAMPLE_DIR}/${SUBDIR}/*.h)
-	IF(NOT EXAMPLE_SRC)
-		MESSAGE("example_${SUBDIR}")
-	ELSE(NOT EXAMPLE_SRC)
-	ADD_EXECUTABLE(${MYTARGET} ${EXAMPLE_SRC} ${EXAMPLE_H})
-	ENDIF(NOT EXAMPLE_SRC)
-	SET_TARGET_PROPERTIES(${MYTARGET} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
-	SET_TARGET_PROPERTIES(${MYTARGET} PROPERTIES OUTPUT_NAME ${SUBDIR})
-	SET_TARGET_PROPERTIES(${TARGET} PROPERTIES PROJECT_LABEL "Examples ${MYTARGET}")
-	#IF(UNIX)
-	#	MESSAGE("so no qui!!!!!!!!!!")
-		FOREACH(LINKLIB osg osgDB osgUtil osgViewer osgText osgGA OpenThreads  ${ARGV1} ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5})
-			IF(${LINKLIB} MATCHES "osg")	
-				#MESSAGE("TARGET_LINK_LIBRARIES(${MYTARGET} ${LINKLIB}")
-				TARGET_LINK_LIBRARIES(${MYTARGET} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-			ELSE(${LINKLIB} MATCHES "osg")	
-			 IF(${LINKLIB} MATCHES "Producer")	
-				#MESSAGE("TARGET_LINK_LIBRARIES(${MYTARGET} ${LINKLIB}")
-				TARGET_LINK_LIBRARIES(${MYTARGET} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-			 ELSE(${LINKLIB} MATCHES "Producer")	
-			  IF(${LINKLIB} MATCHES "OpenThreads")	
-				#MESSAGE("TARGET_LINK_LIBRARIES(${MYTARGET} ${LINKLIB}")
-				IF(MSVC)
-#change in name from standar VS projects					TARGET_LINK_LIBRARIES(${MYTARGET} optimized "${LINKLIB}Win32" debug "${LINKLIB}Win32d" )
-					TARGET_LINK_LIBRARIES(${MYTARGET} optimized "${LINKLIB}" debug "${LINKLIB}d" )
-				ELSE(MSVC)	
-				  TARGET_LINK_LIBRARIES(${MYTARGET} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-        			ENDIF(MSVC)
-			  ELSE(${LINKLIB} MATCHES "OpenThreads")	
-				#MESSAGE("EXTERNAL LIB:TARGET_LINK_LIBRARIES(${MYTARGET} ${LINKLIB}")
-				TARGET_LINK_LIBRARIES(${MYTARGET} ${LINKLIB} )
-			  ENDIF(${LINKLIB} MATCHES "OpenThreads")	
-			 ENDIF(${LINKLIB} MATCHES "Producer")	
-			ENDIF(${LINKLIB} MATCHES "osg")	
-		ENDFOREACH(LINKLIB)
-	#ELSE(UNIX)
-	#	TARGET_LINK_LIBRARIES(${MYTARGET} osg osgDB osgUtil osgProducer ${ARGV1} ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5})
-	#ENDIF(UNIX)
-	SET_TARGET_PROPERTIES(${MYTARGET} PROPERTIES PROJECT_LABEL "example ${SUBDIR}")
-	#speed#TARGET_LOCATIONS_ACCUM(${MYTARGET})
-	#MESSAGE(STATUS "adding osg example ${MYTARGET}")
-	
-	##INSTALL_TARGETS(/bin ${MYTARGET} )
-	IF(WIN32)
-		INSTALL(TARGETS ${MYTARGET} RUNTIME DESTINATION bin  )			
-	ELSE(WIN32)
-		INSTALL(TARGETS ${MYTARGET} RUNTIME DESTINATION share/OpenSceneGraph/bin  )			
-	ENDIF(WIN32)
-ENDMACRO(ADD_OSG_EXAMPLE)
-
-
-
-#---------------------------------------------------
-# MACRO GET_TARGETNAME SUBDIR RESULT 
-# generates a plugin target name for given SUBDIR and sets RESULT accordingly 
-#	e.g. GET_TARGETNAME(osg OSG_TARGET) -> OSG_TARGET is osgdb_osg 
-MACRO(GET_TARGETNAME SUBDIR RESULT)
-	SET(${RESULT} osgdb_${SUBDIR})
-ENDMACRO(GET_TARGETNAME)
-
-#---------------------------------------------------
-# MACRO ADD_OSG_PLUGIN SUBDIR [additional libs to link to]
-# adds a plugin project for given SUBDIR, links libraries given as additional arguments 
-#	e.g. ADD_OSG_PLUGIN(osg osgSim) -> generates is osgdb_osg and links with osgSim 
-
-MACRO(ADD_OSG_PLUGIN SUBDIR)
-	GET_TARGETNAME(${SUBDIR} TARGET)
-#	MESSAGE("globbing in -->${PROJECT_SOURCE_DIR}/${SUBDIR}<--")
-	FILE(GLOB PLUGIN_SRC ${PROJECT_SOURCE_DIR}/${SUBDIR}/*.cpp)
-	FILE(GLOB PLUGIN_H ${PROJECT_SOURCE_DIR}/${SUBDIR}/*.h)
-
-	#ADD_LIBRARY(${TARGET} SHARED ${PLUGIN_SRC} ${PLUGIN_H})
-	ADD_LIBRARY(${TARGET} MODULE ${PLUGIN_SRC} ${PLUGIN_H})
 	IF(NOT MSVC)
-		SET_TARGET_PROPERTIES(${TARGET} PROPERTIES DEBUG_POSTFIX "")
+		SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "")
 	ENDIF(NOT MSVC)
-	SET_TARGET_PROPERTIES(${TARGET} PROPERTIES PROJECT_LABEL "Plugins ${TARGET}")
+	SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
 
-		FOREACH(LINKLIB osg osgDB osgUtil ${ARGV1} ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5})
+	SETUP_LINK_LIBRARIES()
-			IF(${LINKLIB} MATCHES "osg")	
+
-				#MESSAGE("TARGET_LINK_LIBRARIES(${TARGET} optimized ${LINKLIB}")
+#the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/osgPlugins
-				TARGET_LINK_LIBRARIES(${TARGET} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-			ELSE(${LINKLIB} MATCHES "osg")	
-				TARGET_LINK_LIBRARIES(${TARGET} ${LINKLIB})
-			ENDIF(${LINKLIB} MATCHES "osg")	
-		ENDFOREACH(LINKLIB)
-	#ELSE(UNIX)
-	#	SET_TARGET_PROPERTIES(${TARGET} PROPERTIES PROJECT_LABEL "osgPlugins ${SUBDIR}")
-	#	TARGET_LINK_LIBRARIES(${TARGET} osg osgDB osgUtil ${ARGV1} ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5})
-	#ENDIF(UNIX)
-	#speed#TARGET_LOCATIONS_ACCUM(${TARGET})
-	
-	#old_form#INSTALL_TARGETS(/lib ${TARGET} )
 	IF(WIN32)
-		INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin )
+		INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin )
 	ELSE(WIN32)
-		INSTALL(TARGETS ${TARGET} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugins LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugins )
+		INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugins LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugins )
 	ENDIF(WIN32)
-ENDMACRO(ADD_OSG_PLUGIN)
+ENDMACRO(SETUP_PLUGIN)
 
 
+#################################################################################################################
+# this is the macro for example and application setup
+###########################################################
 
+MACRO(SETUP_EXE)
+	#MESSAGE("in -->SETUP_EXE<-- ${TARGET_NAME}-->${TARGET_SRC} <--> ${TARGET_H}<--")
+	IF(NOT TARGET_TARGETNAME)
+			SET(TARGET_TARGETNAME "${TARGET_DEFAULT_PREFIX}${TARGET_NAME}")
+	ENDIF(NOT TARGET_TARGETNAME)
+	IF(NOT TARGET_LABEL)
+			SET(TARGET_LABEL "${TARGET_DEFAULT_LABEL_PREFIX} ${TARGET_NAME}")
+	ENDIF(NOT TARGET_LABEL)
 
-
+	ADD_EXECUTABLE(${TARGET_TARGETNAME} ${TARGET_SRC} ${TARGET_H})
-MACRO(ADD_OSG_PLUGIN_EXTERN SOURCE_DIR _TARGET)
+	SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
-
+	SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
-	FILE(GLOB PLUGIN_SRC ${SOURCE_DIR}/*.cpp)
+	SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME})
-	FILE(GLOB PLUGIN_H ${SOURCE_DIR}/*.h)
-	#ADD_LIBRARY(${TARGET} SHARED ${PLUGIN_SRC} ${PLUGIN_H})
-	ADD_LIBRARY(${_TARGET} MODULE ${PLUGIN_SRC} ${PLUGIN_H})
-	IF(UNIX)
-		SET_TARGET_PROPERTIES(${_TARGET} PROPERTIES DEBUG_POSTFIX "")
-	ENDIF(UNIX)
-		FOREACH(LINKLIB osg osgDB osgUtil ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5})
-			IF(${LINKLIB} MATCHES "osg")	
-				#MESSAGE("TARGET_LINK_LIBRARIES(${TARGET} optimized ${LINKLIB}")
-				TARGET_LINK_LIBRARIES(${_TARGET} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}")
-			ELSE(${LINKLIB} MATCHES "osg")	
-				TARGET_LINK_LIBRARIES(${_TARGET} ${LINKLIB})
-			ENDIF(${LINKLIB} MATCHES "osg")	
-		ENDFOREACH(LINKLIB)
-	#ELSE(UNIX)
-	#	SET_TARGET_PROPERTIES(${TARGET} PROPERTIES PROJECT_LABEL "osgPlugin ${SUBDIR}")
-	#	TARGET_LINK_LIBRARIES(${TARGET} osg osgDB osgUtil ${ARGV1} ${ARGV2} ${ARGV3} ${ARGV4} ${ARGV5})
-	#ENDIF(UNIX)
-	#speed#TARGET_LOCATIONS_ACCUM(${_TARGET})
 	
-	##INSTALL_TARGETS(/lib ${_TARGET} )
+	SETUP_LINK_LIBRARIES()	
-	INSTALL(TARGETS ${_TARGET} RUNTIME DESTINATION bin  )
+
-ENDMACRO(ADD_OSG_PLUGIN_EXTERN)
+ENDMACRO(SETUP_EXE)
+
+MACRO(SETUP_APPLICATION)
+
+        SETUP_EXE()
+        
+	INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin  )
+
+ENDMACRO(SETUP_APPLICATION)
+
+
+MACRO(SETUP_EXAMPLE)
+
+        SETUP_EXE()
+        
+	INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin  )			
+
+ENDMACRO(SETUP_EXAMPLE)
+
+

applications/CMakeLists.txt

@@ -13,14 +13,25 @@ IF(NOT OSGCORE_BUNDLED)
 ENDIF(NOT OSGCORE_BUNDLED)
 SET(OPENSCENEGRAPH_APPLICATION_DIR ${PROJECT_SOURCE_DIR})
 
-INCLUDE(OsgMacroUtils)
 
+SET(TARGET_DEFAULT_PREFIX "application_")
+SET(TARGET_DEFAULT_LABEL_PREFIX "Applications")
+SET(TARGET_COMMON_LIBRARIES 
+	OpenThreads
+	osg 
+	osgDB 
+	osgUtil
+	osgGA
+	osgViewer 
+	osgText 
+)
 
-ADD_OSG_APPLICATION( osgviewer )
+ADD_SUBDIRECTORY(osgviewer)
-ADD_OSG_APPLICATION( osgarchive )
+ADD_SUBDIRECTORY(osgarchive)
-ADD_OSG_APPLICATION( osgconv )
+ADD_SUBDIRECTORY(osgconv)
-ADD_OSG_APPLICATION( osgversion )
+ADD_SUBDIRECTORY(osgversion)
 
+#REWRITE_CMAKELIST(ADD_OSG_EXAMPLE)
 
 #MESSAGE("---->${MY_EXAMPLE_LIST}<---------")
 ##########to get all the variables of Cmake

applications/osgarchive/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgarchive )
+SET(TARGET_SRC osgarchive.cpp )
+#### end var setup  ###
+SETUP_APPLICATION()

applications/osgconv/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgconv )
+SET(TARGET_SRC OrientationConverter.cpp osgconv.cpp )
+SET(TARGET_H OrientationConverter.h )
+#### end var setup  ###
+SETUP_APPLICATION()

applications/osgversion/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgversion )
+SET(TARGET_SRC osgversion.cpp )
+#### end var setup  ###
+SETUP_APPLICATION()

applications/osgviewer/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgviewer )
+SET(TARGET_SRC osgviewer.cpp )
+#### end var setup  ###
+SETUP_APPLICATION()

examples/CMakeLists.txt

@@ -13,99 +13,118 @@ IF(NOT OSGCORE_BUNDLED)
 ENDIF(NOT OSGCORE_BUNDLED)
 SET(OPENSCENEGRAPH_EXAMPLE_DIR ${PROJECT_SOURCE_DIR})
 
-INCLUDE(OsgMacroUtils)
 
+SET(TARGET_DEFAULT_PREFIX "example_")
+SET(TARGET_DEFAULT_LABEL_PREFIX "Examples")
+SET(TARGET_COMMON_LIBRARIES 
+	OpenThreads
+	osg 
+	osgDB 
+	osgUtil
+	osgGA
+	osgViewer 
+	osgText 
+)
 
-
+#this is for asking the production of a single CMakeLists.txt
-ADD_OSG_EXAMPLE( osganimate osgSim )
+#ADD_SUBDIRECTORY(osganimate)
-ADD_OSG_EXAMPLE( osgautotransform )
+ADD_SUBDIRECTORY(osganimate)
-ADD_OSG_EXAMPLE( osgbillboard )
+ADD_SUBDIRECTORY(osgautotransform)
-ADD_OSG_EXAMPLE( osgblendequation osgGA)
+ADD_SUBDIRECTORY(osgbillboard)
-ADD_OSG_EXAMPLE( osgcallback )
+ADD_SUBDIRECTORY(osgblendequation)
-ADD_OSG_EXAMPLE( osgcamera )
+ADD_SUBDIRECTORY(osgcallback)
-ADD_OSG_EXAMPLE( osgcatch osgParticle)
+ADD_SUBDIRECTORY(osgcamera)
-#ADD_OSG_EXAMPLE( osgcegui )
+ADD_SUBDIRECTORY(osgcatch)
-ADD_OSG_EXAMPLE( osgclip )
+#ADD_SUBDIRECTORY(osgcegui)
-#to add subject to find socket#ADD_OSG_EXAMPLE( osgcluster ${OSG_SOCKET_LIBS} )
+ADD_SUBDIRECTORY(osgclip)
-ADD_OSG_EXAMPLE( osgcopy )
+#to add subject to find socket#ADD_SUBDIRECTORY(osgcluster)
-ADD_OSG_EXAMPLE( osgcubemap )
+ADD_SUBDIRECTORY(osgcopy)
-ADD_OSG_EXAMPLE( osgdelaunay  osgGA)
+ADD_SUBDIRECTORY(osgcubemap)
-ADD_OSG_EXAMPLE( osgdepthpartition )
+ADD_SUBDIRECTORY(osgdelaunay)
-ADD_OSG_EXAMPLE( osgdepthshadow  osgShadow)
+ADD_SUBDIRECTORY(osgdepthpartition)
-ADD_OSG_EXAMPLE( osgdistortion )
+ADD_SUBDIRECTORY(osgdepthshadow)
-ADD_OSG_EXAMPLE( osgfadetext osgText)
+ADD_SUBDIRECTORY(osgdistortion)
-ADD_OSG_EXAMPLE( osgforest osgGA)
+ADD_SUBDIRECTORY(osgfadetext)
-ADD_OSG_EXAMPLE( osgfxbrowser osgFX osgGA)
+ADD_SUBDIRECTORY(osgforest)
-ADD_OSG_EXAMPLE( osggeodemo osgGA)
+ADD_SUBDIRECTORY(osgfxbrowser)
-ADD_OSG_EXAMPLE( osggeometry )
+ADD_SUBDIRECTORY(osggeodemo)
+ADD_SUBDIRECTORY(osggeometry)
 #to add subject to find Glut
-#ADD_OSG_EXAMPLE( osgGLUTkeyboardmouse )
+#ADD_SUBDIRECTORY(osgGLUTkeyboardmouse)
-#ADD_OSG_EXAMPLE( osgGLUTsimple )
+#ADD_SUBDIRECTORY(osgGLUTsimple)
-ADD_OSG_EXAMPLE( osghangglide )
+ADD_SUBDIRECTORY(osghangglide)
-ADD_OSG_EXAMPLE( osghud )
+ADD_SUBDIRECTORY(osghud)
-ADD_OSG_EXAMPLE( osgimpostor osgSim )
+ADD_SUBDIRECTORY(osgimpostor)
-ADD_OSG_EXAMPLE( osgintersection osgSim)
+ADD_SUBDIRECTORY(osgintersection)
-IF   (BUILD_OSG_WRAPPERS)
+IF   (BUILD_OSG_WRAPPERS)#
-    ADD_OSG_EXAMPLE( osgintrospection osgIntrospection )
+    ADD_SUBDIRECTORY(osgintrospection)
-ENDIF(BUILD_OSG_WRAPPERS)
+ENDIF(BUILD_OSG_WRAPPERS)#
-ADD_OSG_EXAMPLE( osgkeyboard osgFX )
+ADD_SUBDIRECTORY(osgkeyboard)
-ADD_OSG_EXAMPLE( osgkeyboardmouse osgFX )
+ADD_SUBDIRECTORY(osgkeyboardmouse)
-ADD_OSG_EXAMPLE( osglauncher )
+ADD_SUBDIRECTORY(osglauncher)
-ADD_OSG_EXAMPLE( osglight )
+ADD_SUBDIRECTORY(osglight)
-ADD_OSG_EXAMPLE( osglightpoint osgSim )
+ADD_SUBDIRECTORY(osglightpoint)
-ADD_OSG_EXAMPLE( osglogicop osgGA)
+ADD_SUBDIRECTORY(osglogicop)
-ADD_OSG_EXAMPLE( osglogo )
+ADD_SUBDIRECTORY(osglogo)
-ADD_OSG_EXAMPLE( osgmanipulator osgManipulator )
+ADD_SUBDIRECTORY(osgmanipulator)
-ADD_OSG_EXAMPLE( osgmotionblur )
+ADD_SUBDIRECTORY(osgmotionblur)
-ADD_OSG_EXAMPLE( osgmovie osgGA)
+ADD_SUBDIRECTORY(osgmovie)
-ADD_OSG_EXAMPLE( osgmultiplecameras osgFX)
+ADD_SUBDIRECTORY(osgmultiplecameras)
-ADD_OSG_EXAMPLE( osgmultitexture )
+ADD_SUBDIRECTORY(osgmultitexture)
-ADD_OSG_EXAMPLE( osgoccluder osgGA)
+ADD_SUBDIRECTORY(osgoccluder)
-ADD_OSG_EXAMPLE( osgpagedlod )
+ADD_SUBDIRECTORY(osgpagedlod)
-ADD_OSG_EXAMPLE( osgparametric )
+ADD_SUBDIRECTORY(osgparametric)
-ADD_OSG_EXAMPLE( osgparticle osgParticle)
+ADD_SUBDIRECTORY(osgparticle)
-ADD_OSG_EXAMPLE( osgparticleeffects osgParticle osgGA)
+ADD_SUBDIRECTORY(osgparticleeffects)
-ADD_OSG_EXAMPLE( osgphotoalbum )
+ADD_SUBDIRECTORY(osgphotoalbum)
-ADD_OSG_EXAMPLE( osgpick osgGA)
+ADD_SUBDIRECTORY(osgpick)
-ADD_OSG_EXAMPLE( osgplanets osgGA)
+ADD_SUBDIRECTORY(osgplanets)
-ADD_OSG_EXAMPLE( osgpoints osgGA)
+ADD_SUBDIRECTORY(osgpoints)
-ADD_OSG_EXAMPLE( osgpointsprite )
+ADD_SUBDIRECTORY(osgpointsprite)
-ADD_OSG_EXAMPLE( osgprecipitation osgParticle)
+ADD_SUBDIRECTORY(osgprecipitation)
-ADD_OSG_EXAMPLE( osgprerender )
+ADD_SUBDIRECTORY(osgprerender)
-ADD_OSG_EXAMPLE( osgprerendercubemap )
+ADD_SUBDIRECTORY(osgprerendercubemap)
-ADD_OSG_EXAMPLE( osgreflect )
+ADD_SUBDIRECTORY(osgreflect)
-ADD_OSG_EXAMPLE( osgscalarbar osgSim )
+ADD_SUBDIRECTORY(osgscalarbar)
-ADD_OSG_EXAMPLE( osgscribe )
+ADD_SUBDIRECTORY(osgscribe)
-ADD_OSG_EXAMPLE( osgsequence )
+ADD_SUBDIRECTORY(osgsequence)
-ADD_OSG_EXAMPLE( osgshaders )
+ADD_SUBDIRECTORY(osgshaders)
-ADD_OSG_EXAMPLE( osgshaderterrain OpenThreads)
+ADD_SUBDIRECTORY(osgshaderterrain)
-ADD_OSG_EXAMPLE( osgshadowtexture  osgShadow)
+ADD_SUBDIRECTORY(osgshadowtexture)
-ADD_OSG_EXAMPLE( osgshadow osgShadow)
+ADD_SUBDIRECTORY(osgshadow)
-ADD_OSG_EXAMPLE( osgshape )
+ADD_SUBDIRECTORY(osgshape)
-ADD_OSG_EXAMPLE( osgsimple )
+ADD_SUBDIRECTORY(osgsimple)
 ##################################################
-#ADD_OSG_EXAMPLE( osgsimpleviewerXXX )
+#ADD_SUBDIRECTORY(osgsimpleviewerXXX)
 ##################################################
-ADD_OSG_EXAMPLE( osgsimplifier )
+ADD_SUBDIRECTORY(osgsimplifier)
-ADD_OSG_EXAMPLE( osgsimulation osgSim osgGA)
+ADD_SUBDIRECTORY(osgsimulation)
-ADD_OSG_EXAMPLE( osgterrain osgTerrain)
+ADD_SUBDIRECTORY(osgterrain)
-ADD_OSG_EXAMPLE( osgslice )
+ADD_SUBDIRECTORY(osgslice)
-ADD_OSG_EXAMPLE( osgspacewarp )
+ADD_SUBDIRECTORY(osgspacewarp)
-ADD_OSG_EXAMPLE( osgspheresegment osgSim osgParticle)
+ADD_SUBDIRECTORY(osgspheresegment)
-ADD_OSG_EXAMPLE( osgspotlight )
+ADD_SUBDIRECTORY(osgspotlight)
-ADD_OSG_EXAMPLE( osgstereoimage )
+ADD_SUBDIRECTORY(osgstereoimage)
-ADD_OSG_EXAMPLE( osgteapot ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
-ADD_OSG_EXAMPLE( osgtessellate)
-ADD_OSG_EXAMPLE( osgtext osgText)
-ADD_OSG_EXAMPLE( osgtexture1D )
-ADD_OSG_EXAMPLE( osgtexture2D )
-ADD_OSG_EXAMPLE( osgtexture3D )
-ADD_OSG_EXAMPLE( osgtexturerectangle )
-ADD_OSG_EXAMPLE( osgunittests )
-ADD_OSG_EXAMPLE( osgvertexprogram )
-ADD_OSG_EXAMPLE( osgvolume )
-ADD_OSG_EXAMPLE( osgwindows )
 
+###########################################################################################################
+## this is to specify external libraries linking, these libraries do not differentiate in debug and release
+
+ADD_SUBDIRECTORY(osgteapot)
+
+###########################################################################################################
+
+ADD_SUBDIRECTORY(osgtessellate)#)
+ADD_SUBDIRECTORY(osgtext)
+ADD_SUBDIRECTORY(osgtexture1D)
+ADD_SUBDIRECTORY(osgtexture2D)
+ADD_SUBDIRECTORY(osgtexture3D)
+ADD_SUBDIRECTORY(osgtexturerectangle)
+ADD_SUBDIRECTORY(osgunittests)
+ADD_SUBDIRECTORY(osgvertexprogram)
+ADD_SUBDIRECTORY(osgvolume)
+ADD_SUBDIRECTORY(osgwindows)
+
+#REWRITE_CMAKELIST(ADD_OSG_EXAMPLE)
 
 #MESSAGE("---->${MY_EXAMPLE_LIST}<---------")
 ##########to get all the variables of Cmake

examples/osganimate/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osganimate )
+SET(TARGET_SRC osganimate.cpp )
+SET(TARGET_ADDED_LIBRARIES osgSim )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgautotransform/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgautotransform )
+SET(TARGET_SRC osgautotransform.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgbillboard/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgbillboard )
+SET(TARGET_SRC osgbillboard.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgblendequation/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgblendequation )
+SET(TARGET_SRC osgblendequation.cpp )
+SET(TARGET_ADDED_LIBRARIES osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgcallback/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgcallback )
+SET(TARGET_SRC osgcallback.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgcamera/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgcamera )
+SET(TARGET_SRC osgcamera.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgcatch/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgcatch )
+SET(TARGET_SRC osgcatch.cpp )
+SET(TARGET_ADDED_LIBRARIES osgParticle )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgclip/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgclip )
+SET(TARGET_SRC osgclip.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgcopy/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgcopy )
+SET(TARGET_SRC osgcopy.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgcubemap/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgcubemap )
+SET(TARGET_SRC osgcubemap.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgdelaunay/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgdelaunay )
+SET(TARGET_SRC osgdelaunay.cpp )
+SET(TARGET_ADDED_LIBRARIES osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgdepthpartition/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgdepthpartition )
+SET(TARGET_SRC DepthPartitionNode.cpp DistanceAccumulator.cpp osgdepthpartition.cpp )
+SET(TARGET_H DepthPartitionNode.h DistanceAccumulator.h )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgdepthshadow/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgdepthshadow )
+SET(TARGET_SRC osgdepthshadow.cpp )
+SET(TARGET_ADDED_LIBRARIES osgShadow )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgdistortion/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgdistortion )
+SET(TARGET_SRC osgdistortion.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgfadetext/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgfadetext )
+SET(TARGET_SRC osgfadetext.cpp )
+SET(TARGET_ADDED_LIBRARIES osgText )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgforest/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgforest )
+SET(TARGET_SRC osgforest.cpp )
+SET(TARGET_ADDED_LIBRARIES osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgfxbrowser/CMakeLists.txt

@@ -0,0 +1,8 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgfxbrowser )
+SET(TARGET_SRC Frame.cpp osgfxbrowser.cpp )
+SET(TARGET_H Frame.h )
+SET(TARGET_ADDED_LIBRARIES osgFX osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osggeodemo/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osggeodemo )
+SET(TARGET_SRC osggeodemo.cpp )
+SET(TARGET_ADDED_LIBRARIES osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osggeometry/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osggeometry )
+SET(TARGET_SRC osggeometry.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osghangglide/CMakeLists.txt

@@ -0,0 +1,22 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osghangglide )
+SET(TARGET_SRC
+GliderManipulator.cpp
+base.cpp
+hat.cpp
+osghangglide.cpp
+sky.cpp
+tank.cpp
+terrain.cpp
+trees.cpp
+)
+SET(TARGET_H
+GliderManipulator.h
+hat.h
+terrain_coords.h
+terrain_normals.h
+terrain_texcoords.h
+)
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osghud/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osghud )
+SET(TARGET_SRC osghud.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgimpostor/CMakeLists.txt

@@ -0,0 +1,8 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgimpostor )
+SET(TARGET_SRC TestManipulator.cpp osgimpostor.cpp )
+SET(TARGET_H TestManipulator.h )
+SET(TARGET_ADDED_LIBRARIES osgSim )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgintersection/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgintersection )
+SET(TARGET_SRC osgintersection.cpp )
+SET(TARGET_ADDED_LIBRARIES osgSim )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgkeyboard/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgkeyboard )
+SET(TARGET_SRC osgkeyboard.cpp )
+SET(TARGET_ADDED_LIBRARIES osgFX )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgkeyboardmouse/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgkeyboardmouse )
+SET(TARGET_SRC osgkeyboardmouse.cpp )
+SET(TARGET_ADDED_LIBRARIES osgFX )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osglauncher/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osglauncher )
+SET(TARGET_SRC osglauncher.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osglight/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osglight )
+SET(TARGET_SRC osglight.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osglightpoint/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osglightpoint )
+SET(TARGET_SRC osglightpoint.cpp )
+SET(TARGET_ADDED_LIBRARIES osgSim )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osglogicop/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osglogicop )
+SET(TARGET_SRC osglogicop.cpp )
+SET(TARGET_ADDED_LIBRARIES osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osglogo/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osglogo )
+SET(TARGET_SRC osglogo.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgmanipulator/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgmanipulator )
+SET(TARGET_SRC osgmanipulator.cpp )
+SET(TARGET_ADDED_LIBRARIES osgManipulator )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgmotionblur/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgmotionblur )
+SET(TARGET_SRC osgmotionblur.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgmovie/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgmovie )
+SET(TARGET_SRC osgmovie.cpp )
+SET(TARGET_ADDED_LIBRARIES osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgmultiplecameras/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgmultiplecameras )
+SET(TARGET_SRC osgmultiplecameras.cpp )
+SET(TARGET_ADDED_LIBRARIES osgFX )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgmultitexture/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgmultitexture )
+SET(TARGET_SRC osgmultitexture.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgoccluder/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgoccluder )
+SET(TARGET_SRC osgoccluder.cpp )
+SET(TARGET_ADDED_LIBRARIES osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgpagedlod/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgpagedlod )
+SET(TARGET_SRC osgpagedlod.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgparametric/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgparametric )
+SET(TARGET_SRC osgparametric.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgparticle/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgparticle )
+SET(TARGET_SRC osgparticle.cpp )
+SET(TARGET_ADDED_LIBRARIES osgParticle )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgparticleeffects/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgparticleeffects )
+SET(TARGET_SRC osgparticleeffects.cpp )
+SET(TARGET_ADDED_LIBRARIES osgParticle osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgphotoalbum/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgphotoalbum )
+SET(TARGET_SRC ImageReaderWriter.cpp PhotoArchive.cpp osgphotoalbum.cpp )
+SET(TARGET_H ImageReaderWriter.h PhotoArchive.h )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgpick/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgpick )
+SET(TARGET_SRC osgpick.cpp )
+SET(TARGET_ADDED_LIBRARIES osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgplanets/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgplanets )
+SET(TARGET_SRC osgplanets.cpp )
+SET(TARGET_ADDED_LIBRARIES osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgpoints/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgpoints )
+SET(TARGET_SRC osgpoints.cpp )
+SET(TARGET_ADDED_LIBRARIES osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgpointsprite/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgpointsprite )
+SET(TARGET_SRC osgpointsprite.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgprecipitation/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgprecipitation )
+SET(TARGET_SRC osgprecipitation.cpp )
+SET(TARGET_ADDED_LIBRARIES osgParticle )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgprerender/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgprerender )
+SET(TARGET_SRC osgprerender.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgprerendercubemap/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgprerendercubemap )
+SET(TARGET_SRC osgprerendercubemap.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgreflect/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgreflect )
+SET(TARGET_SRC osgreflect.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgscalarbar/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgscalarbar )
+SET(TARGET_SRC osgscalarbar.cpp )
+SET(TARGET_ADDED_LIBRARIES osgSim )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgscribe/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgscribe )
+SET(TARGET_SRC osgscribe.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgsequence/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgsequence )
+SET(TARGET_SRC osgsequence.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgshaders/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgshaders )
+SET(TARGET_SRC GL2Scene.cpp Noise.cpp osgshaders.cpp )
+SET(TARGET_H GL2Scene.h Noise.h )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgshaderterrain/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgshaderterrain )
+SET(TARGET_SRC osgshaderterrain.cpp )
+SET(TARGET_ADDED_LIBRARIES OpenThreads )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgshadow/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgshadow )
+SET(TARGET_SRC osgshadow.cpp )
+SET(TARGET_ADDED_LIBRARIES osgShadow )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgshadowtexture/CMakeLists.txt

@@ -0,0 +1,8 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgshadowtexture )
+SET(TARGET_SRC CreateShadowedScene.cpp osgshadowtexture.cpp )
+SET(TARGET_H CreateShadowedScene.h )
+SET(TARGET_ADDED_LIBRARIES osgShadow )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgshape/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgshape )
+SET(TARGET_SRC osgshape.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgsimple/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgsimple )
+SET(TARGET_SRC osgsimple.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgsimplifier/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgsimplifier )
+SET(TARGET_SRC osgsimplifier.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgsimulation/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgsimulation )
+SET(TARGET_SRC osgsimulation.cpp )
+SET(TARGET_ADDED_LIBRARIES osgSim osgGA )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgslice/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgslice )
+SET(TARGET_SRC osgslice.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgspacewarp/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgspacewarp )
+SET(TARGET_SRC osgspacewarp.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgspheresegment/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgspheresegment )
+SET(TARGET_SRC osgspheresegment.cpp )
+SET(TARGET_ADDED_LIBRARIES osgSim osgParticle )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgspotlight/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgspotlight )
+SET(TARGET_SRC osgspotlight.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgstereoimage/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgstereoimage )
+SET(TARGET_SRC osgstereoimage.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgteapot/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgteapot )
+SET(TARGET_SRC osgteapot.cpp )
+SET(TARGET_EXTERNAL_LIBRARIES ${OPENGL_LIBRARIES} )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgterrain/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgterrain )
+SET(TARGET_SRC osgterrain.cpp )
+SET(TARGET_ADDED_LIBRARIES osgTerrain )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgtessellate/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgtessellate )
+SET(TARGET_SRC osgtessellate.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgtext/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgtext )
+SET(TARGET_SRC osgtext.cpp )
+SET(TARGET_ADDED_LIBRARIES osgText )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgtexture1D/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgtexture1D )
+SET(TARGET_SRC osgtexture1D.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgtexture2D/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgtexture2D )
+SET(TARGET_SRC osgtexture2D.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgtexture3D/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgtexture3D )
+SET(TARGET_SRC osgtexture3D.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgtexturerectangle/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgtexturerectangle )
+SET(TARGET_SRC osgtexturerectangle.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgunittests/CMakeLists.txt

@@ -0,0 +1,7 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgunittests )
+SET(TARGET_SRC UnitTestFramework.cpp UnitTests_osg.cpp osgunittests.cpp performance.cpp )
+SET(TARGET_H UnitTestFramework.h performance.h )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgvertexprogram/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgvertexprogram )
+SET(TARGET_SRC osgvertexprogram.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgvolume/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgvolume )
+SET(TARGET_SRC osgvolume.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

examples/osgwindows/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME osgwindows )
+SET(TARGET_SRC osgwindows.cpp )
+#### end var setup  ###
+SETUP_EXAMPLE()

src/osgPlugins/3dc/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME 3dc )
+SET(TARGET_SRC ReaderWriter3DC.cpp )
+#### end var setup  ###
+SETUP_PLUGIN()

src/osgPlugins/3ds/CMakeLists.txt

@@ -0,0 +1,51 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME 3ds )
+SET(TARGET_SRC
+ReaderWriter3DS.cpp
+atmosphere.cpp
+background.cpp
+camera.cpp
+chunk.cpp
+ease.cpp
+file.cpp
+lib3ds_float.cpp
+light.cpp
+material.cpp
+matrix.cpp
+mesh.cpp
+node.cpp
+quat.cpp
+readwrite.cpp
+shadow.cpp
+tcb.cpp
+tracks.cpp
+vector.cpp
+viewport.cpp
+)
+SET(TARGET_H
+atmosphere.h
+background.h
+camera.h
+chunk.h
+chunktable.h
+config.h
+ease.h
+file.h
+lib3ds_float.h
+light.h
+material.h
+matrix.h
+mesh.h
+node.h
+quat.h
+readwrite.h
+shadow.h
+tcb.h
+tracks.h
+types.h
+vector.h
+viewport.h
+)
+#### end var setup  ###
+SETUP_PLUGIN()

src/osgPlugins/CMakeLists.txt

@@ -19,79 +19,98 @@ IF(NOT MINGW)
 	SET(CMAKE_SHARED_MODULE_PREFIX "")
 ENDIF(NOT MINGW)
 
-INCLUDE(OsgMacroUtils)
 
-	
+SET(TARGET_DEFAULT_PREFIX "osgdb_")
+SET(TARGET_DEFAULT_LABEL_PREFIX "Plugins")
+SET(TARGET_COMMON_LIBRARIES 
+	osg 
+	osgDB 
+	osgUtil
+)
+
 IF (BUILD_OSG_COMMON_PLUGINS)
-	ADD_OSG_PLUGIN(osgFX osgFX)
+	SET(TARGET_DEFAULT_LABEL_PREFIX "Plug commons")
-	ADD_OSG_PLUGIN(osgParticle osgParticle)
+###########################################################
-	ADD_OSG_PLUGIN(osgSim osgSim)
+#  this is for asking the production of a single CMakeLists.txt
-	ADD_OSG_PLUGIN(osgText osgText)
+#  the BUILD_CMAKELIST can be set at the macro call level or
-	ADD_OSG_PLUGIN(osga)
+#  globally by configuring 
-	ADD_OSG_PLUGIN(rot)
+#  TARGET_DEFAULT_BUILD_CMAKELIST
-	ADD_OSG_PLUGIN(scale)
+#
-	ADD_OSG_PLUGIN(trans)
+#	ADD_OSG_PLUGIN(osgFX osgFX BUILD_CMAKELIST)
+#
+###########################################################
+	ADD_SUBDIRECTORY(osgFX)
+	ADD_SUBDIRECTORY(osgParticle)
+	ADD_SUBDIRECTORY(osgSim)
+	ADD_SUBDIRECTORY(osgText)
+	ADD_SUBDIRECTORY(osga)
+	ADD_SUBDIRECTORY(rot)
+	ADD_SUBDIRECTORY(scale)
+	ADD_SUBDIRECTORY(trans)
 	
-	ADD_OSG_PLUGIN(osg osgSim osgFX osgText)
+	ADD_SUBDIRECTORY(osg)
-	ADD_OSG_PLUGIN(ive osgSim osgFX osgText)
+	ADD_SUBDIRECTORY(ive)
 ENDIF (BUILD_OSG_COMMON_PLUGINS)
 
 IF (BUILD_OSG_IMAGE_PLUGINS)
-	ADD_OSG_PLUGIN(rgb)
+	SET(TARGET_DEFAULT_LABEL_PREFIX "Plug image" )#
-	ADD_OSG_PLUGIN(bmp)
+	ADD_SUBDIRECTORY(rgb)
-	ADD_OSG_PLUGIN(dds)
+	ADD_SUBDIRECTORY(bmp)
-	ADD_OSG_PLUGIN(tga)
+	ADD_SUBDIRECTORY(dds)
-	ADD_OSG_PLUGIN(hdr)
+	ADD_SUBDIRECTORY(tga)
+	ADD_SUBDIRECTORY(hdr)
 	
 	IF(JPEG_FOUND)
-		SUBDIRS( jpeg )
+		ADD_SUBDIRECTORY(jpeg)
 	ENDIF(JPEG_FOUND)
 	IF(GIFLIB_FOUND)
-		SUBDIRS( gif )
+		ADD_SUBDIRECTORY(gif) 
 	ENDIF(GIFLIB_FOUND)
 	IF(PNG_FOUND)
-		SUBDIRS( png )
+		ADD_SUBDIRECTORY(png)
 	ENDIF(PNG_FOUND)
 	IF(TIFF_FOUND)
-		SUBDIRS( tiff )
+		ADD_SUBDIRECTORY(tiff)
 	ENDIF(TIFF_FOUND)
 
 ENDIF (BUILD_OSG_IMAGE_PLUGINS)
 
 IF (BUILD_OSG_3D_PLUGINS)
-	ADD_OSG_PLUGIN(3dc)
+	SET(TARGET_DEFAULT_LABEL_PREFIX "Plug 3d")
-	#ADD_OSG_PLUGIN(Inventor)
+	ADD_SUBDIRECTORY(3dc)
-	#ADD_OSG_PLUGIN(lwo osgFX)
+	#ADD_SUBDIRECTORY(Inventor)
-	ADD_OSG_PLUGIN(x)
+	#ADD_SUBDIRECTORY(lwo)
-	ADD_OSG_PLUGIN(dw)
+	ADD_SUBDIRECTORY(x)
-	ADD_OSG_PLUGIN(dxf)
+	ADD_SUBDIRECTORY(dw)
-	#ADD_OSG_PLUGIN(flt osgSim)
+	ADD_SUBDIRECTORY(dxf)
-	ADD_OSG_PLUGIN(OpenFlight osgSim)
+	#ADD_SUBDIRECTORY(flt)
-	ADD_OSG_PLUGIN(geo osgSim)
+	ADD_SUBDIRECTORY(OpenFlight)
-	ADD_OSG_PLUGIN(obj)
+	ADD_SUBDIRECTORY(geo)
-	#ADD_OSG_PLUGIN(pfb)
+	ADD_SUBDIRECTORY(obj)
-	ADD_OSG_PLUGIN(pic)
+	#ADD_SUBDIRECTORY(pfb)
-	ADD_OSG_PLUGIN(stl)
+	ADD_SUBDIRECTORY(pic)
-	ADD_OSG_PLUGIN(3ds )
+	ADD_SUBDIRECTORY(stl)
-	ADD_OSG_PLUGIN(ac)
+	ADD_SUBDIRECTORY(3ds)
+	ADD_SUBDIRECTORY(ac)
 ENDIF (BUILD_OSG_3D_PLUGINS)
 
 IF (BUILD_OSG_OTHER_PLUGINS)
-	ADD_OSG_PLUGIN(logo)
+	SET(TARGET_DEFAULT_LABEL_PREFIX "Plug other")
-	ADD_OSG_PLUGIN(lws)
+	#ADD_SUBDIRECTORY(logo)
-	ADD_OSG_PLUGIN(md2)
+	ADD_SUBDIRECTORY(lws)
-	ADD_OSG_PLUGIN(osgtgz)
+	ADD_SUBDIRECTORY(md2)
-	#ADD_OSG_PLUGIN(quicktime)
+	ADD_SUBDIRECTORY(osgtgz)
-	ADD_OSG_PLUGIN(tgz)
+	#ADD_SUBDIRECTORY(quicktime)
-	#ADD_OSG_PLUGIN(txp)
+	ADD_SUBDIRECTORY(tgz)
-	#ADD_OSG_PLUGIN(xine)
+	#ADD_SUBDIRECTORY(txp)
-	ADD_OSG_PLUGIN(shp)
+	#ADD_SUBDIRECTORY(xine)
+	ADD_SUBDIRECTORY(shp)
 
 	IF(FREETYPE_FOUND)
-		SUBDIRS( freetype )
+		ADD_SUBDIRECTORY(freetype) 
 	ENDIF(FREETYPE_FOUND)
 	IF(ZLIB_FOUND)
-		ADD_OSG_PLUGIN(zip )
+		ADD_SUBDIRECTORY(zip)
 	ENDIF(ZLIB_FOUND)
 
 ENDIF (BUILD_OSG_OTHER_PLUGINS)
@@ -102,15 +121,18 @@ ENDIF (BUILD_OSG_OTHER_PLUGINS)
 #---------------------------------------------------
 
 IF (BUILD_OSG_NET_PLUGINS)
-	ADD_OSG_PLUGIN(net ${OSG_SOCKET_LIBS})
+	ADD_SUBDIRECTORY(net)
 ENDIF (BUILD_OSG_NET_PLUGINS)
 
+#REWRITE_CMAKELIST(ADD_OSG_PLUGIN)
+
+
 ##########to get all the variables of Cmake
-GET_CMAKE_PROPERTY(MYVARS VARIABLES)
+#GET_CMAKE_PROPERTY(MYVARS VARIABLES)
-FOREACH(myvar ${MYVARS})
+#FOREACH(myvar ${MYVARS})
-	FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/AllVariables.txt
+#	FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/AllVariables.txt
-		"${myvar} -->${${myvar}}<-\n"
+#		"${myvar} -->${${myvar}}<-\n"
-	)
+#	)
-ENDFOREACH(myvar)
+#ENDFOREACH(myvar)
 
 	

src/osgPlugins/OpenFlight/CMakeLists.txt

@@ -0,0 +1,39 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME OpenFlight )
+SET(TARGET_SRC
+AncillaryRecords.cpp
+AttrData.cpp
+ControlRecords.cpp
+DataInputStream.cpp
+Document.cpp
+GeometryRecords.cpp
+LightPointRecords.cpp
+PaletteRecords.cpp
+Pools.cpp
+PrimaryRecords.cpp
+ReaderWriterATTR.cpp
+ReaderWriterFLT.cpp
+Record.cpp
+RecordInputStream.cpp
+Registry.cpp
+ReservedRecords.cpp
+RoadRecords.cpp
+Vertex.cpp
+VertexRecords.cpp
+)
+SET(TARGET_H
+AttrData.h
+DataInputStream.h
+Document.h
+Pools.h
+Record.h
+RecordInputStream.h
+Registry.h
+Vertex.h
+opcodes.h
+types.h
+)
+SET(TARGET_ADDED_LIBRARIES osgSim )
+#### end var setup  ###
+SETUP_PLUGIN()

src/osgPlugins/ac/CMakeLists.txt

@@ -0,0 +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()

src/osgPlugins/bmp/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME bmp )
+SET(TARGET_SRC ReaderWriterBMP.cpp )
+#### end var setup  ###
+SETUP_PLUGIN()

src/osgPlugins/dds/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME dds )
+SET(TARGET_SRC ReaderWriterDDS.cpp )
+#### end var setup  ###
+SETUP_PLUGIN()

src/osgPlugins/dw/CMakeLists.txt

@@ -0,0 +1,6 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME dw )
+SET(TARGET_SRC ReaderWriterDW.cpp )
+#### end var setup  ###
+SETUP_PLUGIN()

src/osgPlugins/dxf/CMakeLists.txt

@@ -0,0 +1,29 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME dxf )
+SET(TARGET_SRC
+ReaderWriterDXF.cpp
+aci.cpp
+dxfBlock.cpp
+dxfEntity.cpp
+dxfFile.cpp
+dxfReader.cpp
+dxfSection.cpp
+dxfTable.cpp
+scene.cpp
+)
+SET(TARGET_H
+aci.h
+codeValue.h
+dxfBlock.h
+dxfDataTypes.h
+dxfEntity.h
+dxfFile.h
+dxfReader.h
+dxfSection.h
+dxfSectionBase.h
+dxfTable.h
+scene.h
+)
+#### end var setup  ###
+SETUP_PLUGIN()

src/osgPlugins/freetype/CMakeLists.txt

@@ -1,8 +1,15 @@
-IF(WIN32)
+#this file is automatically generated 
- SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
+
-ENDIF(WIN32) 
+
-INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIRS} )
+	IF(WIN32)
-#LINK_DIRECTORIES( ${FREETYPE_DIR}/lib )
+		SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
-ADD_OSG_PLUGIN(freetype osgText ${FREETYPE_LIBRARY})
+  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()

src/osgPlugins/geo/CMakeLists.txt

@@ -0,0 +1,19 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME geo )
+SET(TARGET_SRC ClipRegion.cpp ReaderWriterGEO.cpp geoActions.cpp )
+SET(TARGET_H
+ClipRegion.h
+geoCore.h
+geoFormat.h
+geoTypes.h
+geoUnits.h
+geoVersion.h
+osgGeoAction.h
+osgGeoAnimation.h
+osgGeoNodes.h
+osgGeoStructs.h
+)
+SET(TARGET_ADDED_LIBRARIES osgSim )
+#### end var setup  ###
+SETUP_PLUGIN()

src/osgPlugins/gif/CMakeLists.txt

@@ -1,8 +1,16 @@
-INCLUDE_DIRECTORIES( ${GIFLIB_INCLUDE_DIR} )
+#this file is automatically generated 
-LINK_DIRECTORIES( ${GIFLIB_DIR}/lib )
+
-IF(NOT MINGW) 
+
-	ADD_OSG_PLUGIN(gif ${GIFLIB_LIBRARY})
+	INCLUDE_DIRECTORIES( ${GIFLIB_INCLUDE_DIR} )
-ENDIF(NOT MINGW) 
+	LINK_DIRECTORIES( ${GIFLIB_DIR}/lib )
-IF(MSVC)
+
-	SET_TARGET_PROPERTIES(osgdb_gif PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
+SET(TARGET_NAME gif )
-ENDIF(MSVC)
+SET(TARGET_SRC ReaderWriterGIF.cpp )
+SET(TARGET_EXTERNAL_LIBRARIES ${GIFLIB_LIBRARY} )
+#### end var setup  ###
+SETUP_PLUGIN()
+
+IF(MSVC)
+	SET_TARGET_PROPERTIES("${TARGET_DEFAULT_PREFIX}${TARGET_NAME}" PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT")
+ENDIF(MSVC)
+

src/osgPlugins/hdr/CMakeLists.txt

@@ -0,0 +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()

src/osgPlugins/ive/CMakeLists.txt

@@ -0,0 +1,196 @@
+#this file is automatically generated 
+
+SET(TARGET_NAME ive )
+SET(TARGET_SRC
+AlphaFunc.cpp
+AnimationPath.cpp
+AnimationPathCallback.cpp
+AutoTransform.cpp
+AzimElevationSector.cpp
+AzimSector.cpp
+Billboard.cpp
+BlendColor.cpp
+BlendFunc.cpp
+BlinkSequence.cpp
+Camera.cpp
+CameraView.cpp
+ClipNode.cpp
+ClipPlane.cpp
+ClusterCullingCallback.cpp
+ColorMask.cpp
+ConeSector.cpp
+ConvexPlanarOccluder.cpp
+ConvexPlanarPolygon.cpp
+CoordinateSystemNode.cpp
+CullFace.cpp
+DOFTransform.cpp
+DataInputStream.cpp
+DataOutputStream.cpp
+Depth.cpp
+DirectionalSector.cpp
+DrawArrayLengths.cpp
+DrawArrays.cpp
+DrawElementsUByte.cpp
+DrawElementsUInt.cpp
+DrawElementsUShort.cpp
+Drawable.cpp
+ElevationSector.cpp
+EllipsoidModel.cpp
+Exception.cpp
+FragmentProgram.cpp
+FrontFace.cpp
+Geode.cpp
+Geometry.cpp
+Group.cpp
+Image.cpp
+Impostor.cpp
+LOD.cpp
+Light.cpp
+LightModel.cpp
+LightPoint.cpp
+LightPointNode.cpp
+LightSource.cpp
+LineWidth.cpp
+Material.cpp
+MatrixTransform.cpp
+MultiSwitch.cpp
+MultiTextureControl.cpp
+Node.cpp
+Object.cpp
+OccluderNode.cpp
+PagedLOD.cpp
+Point.cpp
+PointSprite.cpp
+PolygonMode.cpp
+PolygonOffset.cpp
+PositionAttitudeTransform.cpp
+PrimitiveSet.cpp
+Program.cpp
+ProxyNode.cpp
+ReaderWriterIVE.cpp
+Scissor.cpp
+Sequence.cpp
+ShadeModel.cpp
+Shader.cpp
+Shape.cpp
+ShapeDrawable.cpp
+StateSet.cpp
+Stencil.cpp
+Switch.cpp
+TexEnv.cpp
+TexEnvCombine.cpp
+TexGen.cpp
+TexGenNode.cpp
+TexMat.cpp
+Text.cpp
+Texture.cpp
+Texture1D.cpp
+Texture2D.cpp
+Texture3D.cpp
+TextureCubeMap.cpp
+TextureRectangle.cpp
+Transform.cpp
+Uniform.cpp
+VertexProgram.cpp
+Viewport.cpp
+VisibilityGroup.cpp
+)
+SET(TARGET_H
+AlphaFunc.h
+AnimationPath.h
+AnimationPathCallback.h
+AutoTransform.h
+AzimElevationSector.h
+AzimSector.h
+Billboard.h
+BlendColor.h
+BlendFunc.h
+BlinkSequence.h
+Camera.h
+CameraView.h
+ClipNode.h
+ClipPlane.h
+ClusterCullingCallback.h
+ColorMask.h
+ConeSector.h
+ConvexPlanarOccluder.h
+ConvexPlanarPolygon.h
+CoordinateSystemNode.h
+CullFace.h
+DOFTransform.h
+DataInputStream.h
+DataOutputStream.h
+DataTypeSize.h
+Depth.h
+DirectionalSector.h
+DrawArrayLengths.h
+DrawArrays.h
+DrawElementsUByte.h
+DrawElementsUInt.h
+DrawElementsUShort.h
+Drawable.h
+ElevationSector.h
+EllipsoidModel.h
+Exception.h
+FragmentProgram.h
+FrontFace.h
+Geode.h
+Geometry.h
+Group.h
+Image.h
+Impostor.h
+IveVersion.h
+LOD.h
+Light.h
+LightModel.h
+LightPoint.h
+LightPointNode.h
+LightSource.h
+LineWidth.h
+Material.h
+MatrixTransform.h
+MultiSwitch.h
+MultiTextureControl.h
+Node.h
+Object.h
+OccluderNode.h
+PagedLOD.h
+Point.h
+PointSprite.h
+PolygonMode.h
+PolygonOffset.h
+PositionAttitudeTransform.h
+PrimitiveSet.h
+Program.h
+ProxyNode.h
+ReadWrite.h
+Scissor.h
+Sequence.h
+ShadeModel.h
+Shader.h
+Shape.h
+ShapeDrawable.h
+StateSet.h
+Stencil.h
+Switch.h
+TexEnv.h
+TexEnvCombine.h
+TexGen.h
+TexGenNode.h
+TexMat.h
+Text.h
+Texture.h
+Texture1D.h
+Texture2D.h
+Texture3D.h
+TextureCubeMap.h
+TextureRectangle.h
+Transform.h
+Uniform.h
+VertexProgram.h
+Viewport.h
+VisibilityGroup.h
+)
+SET(TARGET_ADDED_LIBRARIES osgSim osgFX osgText )
+#### end var setup  ###
+SETUP_PLUGIN()

src/osgPlugins/jpeg/CMakeLists.txt

@@ -1,7 +1,11 @@
-IF(MSVC)
+#this file is automatically generated 
- SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRT")
-ENDIF(MSVC) 
-INCLUDE_DIRECTORIES( ${JPEG_INCLUDE_DIR} )
-#LINK_DIRECTORIES( ${JPEG_DIR}/lib )
-ADD_OSG_PLUGIN(jpeg ${JPEG_LIBRARY})
 
+
+	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()