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

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

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

Log Message:
-----------


Modified Paths:
--------------
    branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
    branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
    branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
    branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
    branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt
    branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt
    branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt

Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt	2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt	2008-08-24 02:24:36 UTC (rev 298)
@@ -31,11 +31,21 @@
 #
 find_package(OpenGL)
 find_package(GLUT)
-find_package(GStreamer)
-find_package(OpenVRML)
 find_package(PkgConfig)
 
+
+find_package(GStreamer)
+
+
 #
+# Optional build with OpenVRML
+#
+option(ARTOOLKIT_USE_OPENVRML "Create VRML based libraries and examples" OFF)
+if (ARTOOLKIT_USE_OPENVRML)
+	find_package(OpenVRML)
+endif(ARTOOLKIT_USE_OPENVRML)
+
+#
 # Preset some of the output directories
 # 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Executable output folder")
@@ -116,15 +126,15 @@
 add_subdirectory(patterns)
 
 
-#
-# Uninstall
-#
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY)
-  
-add_custom_target(uninstall
+#
+# Uninstall
+#
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
+  
+add_custom_target(uninstall
   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
 
 

Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake	2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake	2008-08-24 02:24:36 UTC (rev 298)
@@ -3,6 +3,7 @@
 set(ARTOOLKIT_FILES_DATA
 	${CMAKE_SOURCE_DIR}/bin/Data/camera_para.dat
 	${CMAKE_SOURCE_DIR}/bin/Data/object_data
+	${CMAKE_SOURCE_DIR}/bin/Data/object_data_vrml
 	${CMAKE_SOURCE_DIR}/bin/Data/object_data2
 	${CMAKE_SOURCE_DIR}/bin/Data/paddle_data
 	${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
@@ -15,6 +16,21 @@
 	${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml
 )
 
+set(ARTOOLKIT_FILES_VRML
+	${CMAKE_SOURCE_DIR}/bin/Wrl/bud_B.dat
+	${CMAKE_SOURCE_DIR}/bin/Wrl/snoman.dat
+	${CMAKE_SOURCE_DIR}/bin/Wrl/bud_B.wrl
+	${CMAKE_SOURCE_DIR}/bin/Wrl/snoman.wrl
+)
+
+set(ARTOOLKIT_FILES_VRML_TEXTURES
+	${CMAKE_SOURCE_DIR}/bin/Wrl/textures/bud_B_Fractal_2.gif
+	${CMAKE_SOURCE_DIR}/bin/Wrl/textures/bud_B_Ramp_6.gif
+	${CMAKE_SOURCE_DIR}/bin/Wrl/textures/bud_B_Ramp_2.gif
+	${CMAKE_SOURCE_DIR}/bin/Wrl/textures/bud_B_Ramp_4.gif
+	${CMAKE_SOURCE_DIR}/bin/Wrl/textures/bud_B_Ramp_5.gif
+)
+
 set(ARTOOLKIT_FILES_DATA_WIN32
 	${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera_flipV.xml
 	${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml

Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake	2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake	2008-08-24 02:24:36 UTC (rev 298)
@@ -10,7 +10,28 @@
 # Created by Robert Osfield. 
 # Modified for the debug library by Jean-S?stien Guay.
 
+
+set(OPENVRML_LIB_SEARCH_PATHS
+	${CMAKE_SOURCE_DIR}/../openvrml-0.16.6-bin-macosx/lib
+    $ENV{OPENVRML_DIR}/lib
+    $ENV{OPENVRML_DIR}
+    $ENV{OSGDIR}/lib
+    $ENV{OSGDIR}
+    $ENV{OSG_ROOT}/lib
+    ~/Library/Frameworks
+    /Library/Frameworks
+    /usr/local/lib
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/csw/lib
+    /opt/lib
+    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+    /usr/freeware/lib64
+	)
+
 FIND_PATH(OPENVRML_INCLUDE_DIR openvrml/system.h
+	${CMAKE_SOURCE_DIR}/../openvrml-0.16.6-bin-macosx/include
     $ENV{OPENVRML_DIR}/include
     $ENV{OPENVRML_DIR}
     $ENV{OSGDIR}/include
@@ -28,48 +49,54 @@
     /usr/freeware/include
 )
 
-FIND_LIBRARY(OPENVRML_openvrml_LIBRARY 
-    NAMES openvrml
+FIND_LIBRARY(OPENVRML_jpeg_LIBRARY 
+    NAMES jpeg
     PATHS
-    $ENV{OPENVRML_DIR}/lib
-    $ENV{OPENVRML_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
+	${OPENVRML_LIB_SEARCH_PATHS}
 )
 
+FIND_LIBRARY(OPENVRML_png_LIBRARY 
+    NAMES png
+    PATHS
+	${OPENVRML_LIB_SEARCH_PATHS}
+)
+
 FIND_LIBRARY(OPENVRML_gl_LIBRARY 
     NAMES openvrml-gl
     PATHS
-    $ENV{OPENVRML_DIR}/lib
-    $ENV{OPENVRML_DIR}
-    $ENV{OSGDIR}/lib
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/lib
-    ~/Library/Frameworks
-    /Library/Frameworks
-    /usr/local/lib
-    /usr/lib
-    /sw/lib
-    /opt/local/lib
-    /opt/csw/lib
-    /opt/lib
-    [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-    /usr/freeware/lib64
+	${OPENVRML_LIB_SEARCH_PATHS}
 )
 
+FIND_LIBRARY(OPENVRML_js_LIBRARY 
+    NAMES js
+    PATHS
+	${OPENVRML_LIB_SEARCH_PATHS}
+)
 
+FIND_LIBRARY(OPENVRML_boost_LIBRARY 
+    NAMES boost_thread-1_33_1
+    PATHS
+	${OPENVRML_LIB_SEARCH_PATHS}
+)
 
+FIND_LIBRARY(OPENVRML_plds4_LIBRARY 
+    NAMES plds4
+    PATHS
+	${OPENVRML_LIB_SEARCH_PATHS}
+)
+
+FIND_LIBRARY(OPENVRML_nspr4_LIBRARY 
+    NAMES nspr4
+    PATHS
+	${OPENVRML_LIB_SEARCH_PATHS}
+)
+
+FIND_LIBRARY(OPENVRML_plc4_LIBRARY 
+    NAMES plc4
+    PATHS
+	${OPENVRML_LIB_SEARCH_PATHS}
+)
+
 FIND_LIBRARY(OPENVRML_LIBRARY_DEBUG 
     NAMES openvrmld
     PATHS
@@ -93,10 +120,21 @@
 SET(OPENVRML_FOUND "NO")
 IF(OPENVRML_openvrml_LIBRARY AND OPENVRML_INCLUDE_DIR)
     SET(OPENVRML_FOUND "YES")
+	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}
+		)
 ENDIF(OPENVRML_openvrml_LIBRARY AND OPENVRML_INCLUDE_DIR)
 
-SET(OPENVRML_LIBRARIES ${OPENVRML_openvrml_LIBRARY} ${OPENVRML_gl_LIBRARY})
 
+
 #-------------- next part --------------
 IF (WIN32)
     INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})

Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in	2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in	2008-08-24 02:24:36 UTC (rev 298)
@@ -49,7 +49,7 @@
 	if   (APPLE)
 		# only use the PackageMaker version on Mac
 		set(CPACK_GENERATOR "PackageMaker")
-	elif(APPLE)
+	else(APPLE)
 		# use the source and deb package generators if possible
 		set(CPACK_GENERATOR "STGZ;TGZ;DEB")
 

Modified: branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt	2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt	2008-08-24 02:24:36 UTC (rev 298)
@@ -7,8 +7,6 @@
 	simpleVRML.c
 	)
 
-
-
 if(APPLE)
 
 	set(MACOSX_BUNDLE_BUNDLE_NAME           ${EXE_NAME})
@@ -36,8 +34,33 @@
 		MACOSX_PACKAGE_LOCATION "Resources/Data/multi"
 		)
 		
+	set_source_files_properties(
+		${ARTOOLKIT_FILES_VRML}
+		PROPERTIES
+		HEADER_FILE_ONLY TRUE
+		MACOSX_PACKAGE_LOCATION "Resources/Wrl"
+		)
+		
+	set_source_files_properties(
+		${ARTOOLKIT_FILES_VRML_TEXTURES}
+		PROPERTIES
+		HEADER_FILE_ONLY TRUE
+		MACOSX_PACKAGE_LOCATION "Resources/Wrl/textures"
+		)
+	
+		
+	set_source_files_properties(
+		${OPENVRML_LIBRARIES}
+		PROPERTIES
+		HEADER_FILE_ONLY TRUE
+		MACOSX_PACKAGE_LOCATION "MacOS"
+		)
+		
 	add_executable(${EXE_NAME} MACOSX_BUNDLE 
 		${SRCS} ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+		${ARTOOLKIT_FILES_VRML_TEXTURES}
+		${ARTOOLKIT_FILES_VRML}
+		${ARTOOLKIT_FILES_DATA}
 		)
 		
 else(APPLE)
@@ -46,8 +69,9 @@
 
 
 target_link_libraries(${EXE_NAME} 
+	${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${OPENVRML_LIBRARIES}
 	AR ARgsub ARgsub_lite ARgsubUtil ARvrml ARvideo
-	${GLUT_LIBRARIES} ${OPENGL_LIBRARIES}
-	${OPENVRML_LIBRARIES})
+	stdc++
+	)
 
 

Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt	2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt	2008-08-24 02:24:36 UTC (rev 298)
@@ -52,7 +52,12 @@
 
 add_library(${lib_name} ${hdrs_public} ${srcs_openvrml})
 
-target_link_libraries(${lib_name} AR ${OPENGL_LIBRARY} ${GLUT_LIBRARIES})
+target_link_libraries(${lib_name} 
+	AR 
+	${OPENVRML_LIBRARIES} 
+	${OPENGL_LIBRARY} 
+	${GLUT_LIBRARIES}
+	)
 	
 artoolkit_install(${lib_name})
 

Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt	2008-08-22 02:22:09 UTC (rev 297)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt	2008-08-24 02:24:36 UTC (rev 298)
@@ -47,9 +47,9 @@
 	endif(USE_GSTREAMER)
 endif(UNIX)
 
-find_package(OpenVRML)
+
 if(OPENVRML_FOUND)
-	option(ARTOOLKIT_USE_OPENVRML "Create VRML based libraries and examples" ON)
+	find_package(OpenVRML)	
 	if(ARTOOLKIT_USE_OPENVRML)
 		add_subdirectory(ARvrml)
 	endif(ARTOOLKIT_USE_OPENVRML)


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