[artoolkit-commits] SF.net SVN: artoolkit:[299] branches/hartmut-pre-2_8/artoolkit

[<ret...@us...>]

Revision: 299
          http://artoolkit.svn.sourceforge.net/artoolkit/?rev=299&view=rev
Author:   retrakker
Date:     2008-08-24 21:44:24 +0000 (Sun, 24 Aug 2008)

Log Message:
-----------
minor fix for Linux build

Modified Paths:
--------------
    branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
    branches/hartmut-pre-2_8/artoolkit/bin/Data/object_data_vrml

Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake	2008-08-24 02:24:36 UTC (rev 298)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake	2008-08-24 21:44:24 UTC (rev 299)
@@ -123,14 +123,18 @@
 	SET(OPENVRML_LIBRARIES
 		${OPENVRML_openvrml_LIBRARY}
 		${OPENVRML_gl_LIBRARY}
-		${OPENVRML_jpeg_LIBRARY}
-		${OPENVRML_boost_LIBRARY}
-		${OPENVRML_js_LIBRARY}
-		${OPENVRML_png_LIBRARY}
-		${OPENVRML_plc4_LIBRARY}
-		${OPENVRML_nspr4_LIBRARY}
-		${OPENVRML_plds4_LIBRARY}
 		)
+	if(APPLE)
+		list(APPEND
+			${OPENVRML_jpeg_LIBRARY}
+			${OPENVRML_boost_LIBRARY}
+			${OPENVRML_js_LIBRARY}
+			${OPENVRML_png_LIBRARY}
+			${OPENVRML_plc4_LIBRARY}
+			${OPENVRML_nspr4_LIBRARY}
+			${OPENVRML_plds4_LIBRARY}
+		)
+	endif(APPLE)
 ENDIF(OPENVRML_openvrml_LIBRARY AND OPENVRML_INCLUDE_DIR)
 
 

Modified: branches/hartmut-pre-2_8/artoolkit/bin/Data/object_data_vrml
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/bin/Data/object_data_vrml	2008-08-24 02:24:36 UTC (rev 298)
+++ branches/hartmut-pre-2_8/artoolkit/bin/Data/object_data_vrml	2008-08-24 21:44:24 UTC (rev 299)
@@ -2,8 +2,7 @@
 2
 
 #pattern 1
-#VRML	Wrl/bud_B.dat
-VRML	Wrl/snoman.dat
+VRML	Wrl/bud_B.dat
 Data/patt.hiro 
 80.0
 0.0 0.0


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