[artoolkit-commits] SF.net SVN: artoolkit:[309] branches/hartmut-pre-2_8/artoolkit
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
Menu
▾
▴
[artoolkit-commits] SF.net SVN: artoolkit:[309] branches/hartmut-pre-2_8/artoolkit
|
From: <ret...@us...> - 2008-12-12 01:19:20
|
Revision: 309
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=309&view=rev
Author: retrakker
Date: 2008-12-12 01:19:15 +0000 (Fri, 12 Dec 2008)
Log Message:
-----------
- openvrml on Windows working again - using Philips' binary package for VS 2005
- polished the CPack part a bit
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/examples/simpleVRML/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt
Added Paths:
-----------
branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.ico
branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.rc.in
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-12-12 01:19:15 UTC (rev 309)
@@ -17,8 +17,8 @@
set(ARTOOLKIT_VERSION_MAJOR 2)
set(ARTOOLKIT_VERSION_MINOR 72)
-set(ARTOOLKIT_VERSION_TINY 3)
-set(ARTOOLKIT_VERSION_REV 99)
+set(ARTOOLKIT_VERSION_TINY 4)
+set(ARTOOLKIT_VERSION_REV 1212)
set(ARTOOLKIT_VERSION_SHORT "${ARTOOLKIT_VERSION_MAJOR}.${ARTOOLKIT_VERSION_MINOR}")
set(ARTOOLKIT_VERSION_FULL
@@ -157,7 +157,7 @@
configure_file(
${CMAKE_SOURCE_DIR}/CMakeModules/Packaging.cmake.in
${CMAKE_BINARY_DIR}/.cpack/ARTKPackaging.cmake
- @ONLY
+ IMMEDIATE @ONLY
)
include(${CMAKE_BINARY_DIR}/.cpack/ARTKPackaging.cmake)
endif (ARTOOLKIT_BUILD_PACKAGE)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-12-12 01:19:15 UTC (rev 309)
@@ -84,7 +84,15 @@
)
else(APPLE)
- add_executable(${EXE_NAME} ${${SRCS}})
+ set(TEMP_RC_NAME ${CMAKE_BINARY_DIR}/.rc/${EXE_NAME}_temp.rc)
+
+ configure_file(
+ ${CMAKE_SOURCE_DIR}/share/ARToolKit.rc.in
+ ${TEMP_RC_NAME}
+ IMMEDIATE @ONLY
+ )
+
+ add_executable(${EXE_NAME} ${${SRCS}} ${TEMP_RC_NAME})
endif(APPLE)
endmacro(artoolkit_executable)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/FindOpenVRML.cmake 2008-12-12 01:19:15 UTC (rev 309)
@@ -9,27 +9,13 @@
#
# Created by Robert Osfield.
# Modified for the debug library by Jean-S?stien Guay.
+# Modified by Hartmut Seichter for inclusion into ARToolKit
+#
-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
- )
-
+set(OPENVRML_ROOT_DIR CACHE PATH "OpenVRML Binary root directory")
+
+
FIND_PATH(OPENVRML_INCLUDE_DIR openvrml/system.h
${CMAKE_SOURCE_DIR}/../openvrml-0.16.6-bin-macosx/include
$ENV{OPENVRML_DIR}/include
@@ -49,54 +35,99 @@
/usr/freeware/include
)
-FIND_LIBRARY(OPENVRML_jpeg_LIBRARY
- NAMES jpeg
- PATHS
- ${OPENVRML_LIB_SEARCH_PATHS}
-)
-FIND_LIBRARY(OPENVRML_png_LIBRARY
- NAMES png
- PATHS
- ${OPENVRML_LIB_SEARCH_PATHS}
-)
+if(OPENVRML_INCLUDE_DIR)
+ set(OPENVRML_ROOT_DIR ${OPENVRML_INCLUDE_DIR}/../)
+endif(OPENVRML_INCLUDE_DIR)
+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
+ ${OPENVRML_ROOT_DIR}/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_LIBRARY(OPENVRML_gl_LIBRARY
- NAMES openvrml-gl
- PATHS
+ NAMES openvrml-gl
+ PATHS
${OPENVRML_LIB_SEARCH_PATHS}
)
-FIND_LIBRARY(OPENVRML_js_LIBRARY
- NAMES js
- PATHS
+FIND_LIBRARY(OPENVRML_openvrml_LIBRARY
+ NAMES openvrml
+ PATHS
${OPENVRML_LIB_SEARCH_PATHS}
)
-FIND_LIBRARY(OPENVRML_boost_LIBRARY
- NAMES boost_thread-1_33_1
- PATHS
- ${OPENVRML_LIB_SEARCH_PATHS}
-)
+IF(APPLE)
+ FIND_LIBRARY(OPENVRML_jpeg_LIBRARY
+ NAMES jpeg
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+ )
-FIND_LIBRARY(OPENVRML_plds4_LIBRARY
- NAMES plds4
- PATHS
- ${OPENVRML_LIB_SEARCH_PATHS}
-)
+ FIND_LIBRARY(OPENVRML_png_LIBRARY
+ NAMES png
+ 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_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}
+ )
+ENDIF(APPLE)
+
+IF(WIN32)
+ FIND_LIBRARY(OPENVRML_boost_LIBRARY
+ NAMES
+ boost_thread-1_34_1
+ libboost_thread-vc80-mt-1_34_1
+ PATHS
+ ${OPENVRML_LIB_SEARCH_PATHS}
+ )
+ENDIF(WIN32)
+
FIND_LIBRARY(OPENVRML_LIBRARY_DEBUG
NAMES openvrmld
PATHS
@@ -123,11 +154,11 @@
SET(OPENVRML_LIBRARIES
${OPENVRML_openvrml_LIBRARY}
${OPENVRML_gl_LIBRARY}
+ ${OPENVRML_boost_LIBRARY}
)
if(APPLE)
list(APPEND
${OPENVRML_jpeg_LIBRARY}
- ${OPENVRML_boost_LIBRARY}
${OPENVRML_js_LIBRARY}
${OPENVRML_png_LIBRARY}
${OPENVRML_plc4_LIBRARY}
@@ -142,12 +173,14 @@
#-------------- next part --------------
IF (WIN32)
INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml ${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
- SET(OPENVRML_ANTLR_LIBRARY antlr.lib)
- SET(OPENVRML_ANTLR_LIBRARY_DEBUG antlrd.lib)
- SET(OPENVRML_REGEX_LIBRARY regex.lib)
- SET(OPENVRML_REGEX_LIBRARY_DEBUG regexd.lib)
- SET(TARGET_LIBRARIES_VARS OPENVRML_ANTLR_LIBRARY OPENVRML_REGEX_LIBRARY OPENVRML_LIBRARY JPEG_LIBRARY PNG_LIBRARY ZLIB_LIBRARY)
+
+# SET(OPENVRML_ANTLR_LIBRARY antlr.lib)
+# SET(OPENVRML_ANTLR_LIBRARY_DEBUG antlrd.lib)
+# SET(OPENVRML_REGEX_LIBRARY regex.lib)
+# SET(OPENVRML_REGEX_LIBRARY_DEBUG regexd.lib)
+# SET(TARGET_LIBRARIES_VARS OPENVRML_ANTLR_LIBRARY OPENVRML_REGEX_LIBRARY OPENVRML_LIBRARY JPEG_LIBRARY PNG_LIBRARY ZLIB_LIBRARY)
SET(TARGET_EXTERNAL_LIBRARIES Ws2_32.lib)
+
ELSE(WIN32)
INCLUDE_DIRECTORIES( ${OPENVRML_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR}/openvrml)
ENDIF(WIN32)
Modified: branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/examples/simpleVRML/CMakeLists.txt 2008-12-12 01:19:15 UTC (rev 309)
@@ -1,6 +1,9 @@
set(EXE_NAME simpleVRML)
+
+include_directories(${GLUT_INCLUDE_DIR})
+
set(SRCS
object.h
object.c
@@ -56,22 +59,83 @@
MACOSX_PACKAGE_LOCATION "MacOS"
)
- add_executable(${EXE_NAME} MACOSX_BUNDLE
- ${SRCS} ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+ list(APPEND
+ ${SRCS}
+ ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
${ARTOOLKIT_FILES_VRML_TEXTURES}
${ARTOOLKIT_FILES_VRML}
- ${ARTOOLKIT_FILES_DATA}
+ ${ARTOOLKIT_FILES_DATA}
)
else(APPLE)
- add_executable(${EXE_NAME} ${SRCS})
+ ## add_executable(${EXE_NAME} ${SRCS})
endif(APPLE)
+artoolkit_example_glut(${EXE_NAME} SRCS)
+
target_link_libraries(${EXE_NAME}
${GLUT_LIBRARIES} ${OPENGL_LIBRARIES} ${OPENVRML_LIBRARIES}
AR ARgsub ARgsub_lite ARgsubUtil ARvrml ARvideo
- stdc++
)
+
+if (CMAKE_COMPILER_IS_GNUCC)
+ target_link_libraries(${EXE_NAME}
+ stdc++
+ )
+endif (CMAKE_COMPILER_IS_GNUCC)
+set(target ${EXE_NAME})
+
+if (cmake_version_short GREATER "2.5")
+ install(TARGETS ${target}
+ BUNDLE DESTINATION "/Applications/ARToolKit-${ARTOOLKIT_VERSION_FULL}"
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION ${lib_dest}
+ ARCHIVE DESTINATION lib
+ PUBLIC_HEADER DESTINATION include/AR
+ PERMISSIONS
+ OWNER_EXECUTE OWNER_WRITE OWNER_READ
+ GROUP_EXECUTE GROUP_READ
+ WORLD_EXECUTE WORLD_READ
+ )
+else(cmake_version_short GREATER "2.5")
+ install(TARGETS ${target}
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION ${lib_dest}
+ ARCHIVE DESTINATION lib
+ PERMISSIONS
+ OWNER_EXECUTE OWNER_WRITE OWNER_READ
+ GROUP_EXECUTE GROUP_READ
+ WORLD_EXECUTE WORLD_READ
+ )
+endif(cmake_version_short GREATER "2.5")
+
+if(WIN32)
+
+ get_filename_component(OPENVRML_LIB_PATH ${OPENVRML_openvrml_LIBRARY} PATH)
+ file(GLOB OPENVRML_DLLS ${OPENVRML_LIB_PATH}/../bin/*${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+
+ install(FILES ${ARTOOLKIT_FILES_VRML_TEXTURES}
+ DESTINATION bin/Wrl/textures
+ )
+ install(FILES ${ARTOOLKIT_FILES_VRML}
+ DESTINATION bin/Wrl
+ )
+
+ install(
+ FILES ${OPENVRML_LIBRARIES}
+ DESTINATION lib
+ )
+
+ install(FILES ${OPENVRML_DLLS}
+ DESTINATION bin
+ )
+
+endif(WIN32)
+
+
+
+
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARvrml/CMakeLists.txt 2008-12-12 01:19:15 UTC (rev 309)
@@ -50,6 +50,11 @@
include_directories(${CMAKE_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR} ${OPENVRML_INCLUDE_DIR})
+if(WIN32)
+ add_definitions(-DOPENVRML_USE_DLL -DOPENVRML_GL_USE_DLL)
+endif(WIN32)
+
+
add_library(${lib_name} ${hdrs_public} ${srcs_openvrml})
target_link_libraries(${lib_name}
@@ -61,6 +66,7 @@
artoolkit_install(${lib_name})
+
install(FILES ${hdrs_public}
DESTINATION include/AR
)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt 2008-12-12 00:13:54 UTC (rev 308)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt 2008-12-12 01:19:15 UTC (rev 309)
@@ -1,5 +1,5 @@
#
-# CMake build system for DSVL 0.0.8c
+# CMake build system for DSVL 0.0.8h
# (c) Copyrights 2007-2008 Hartmut Seichter, HIT Lab NZ
#
Added: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.ico
===================================================================
(Binary files differ)
Property changes on: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.rc.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.rc.in (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/share/ARToolKit.rc.in 2008-12-12 01:19:15 UTC (rev 309)
@@ -0,0 +1,27 @@
+#include <winver.h>
+
+
+1 VERSIONINFO
+FILEVERSION @ARTOOLKIT_VERSION_MAJOR@,@ARTOOLKIT_VERSION_MINOR@,@ARTOOLKIT_VERSION_TINY@,0
+PRODUCTVERSION @ARTOOLKIT_VERSION_MAJOR@,@ARTOOLKIT_VERSION_MINOR@,@ARTOOLKIT_VERSION_TINY@,0
+FILEFLAGSMASK 0
+FILEOS VOS__WINDOWS32
+FILETYPE VFT_APP
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "FileVersion", "@ARTOOLKIT_VERSION_MAJOR@,@ARTOOLKIT_VERSION_MINOR@,@ARTOOLKIT_VERSION_TINY@"
+ VALUE "ProductVersion", "@ARTOOLKIT_VERSION_MAJOR@,@ARTOOLKIT_VERSION_MINOR@,@ARTOOLKIT_VERSION_TINY@"
+ VALUE "FileDescription", "@EXE_NAME@"
+ VALUE "InternalName", "@EXE_NAME@"
+ VALUE "ProductName", "@EXE_NAME@"
+ VALUE "OriginalFilename", "@EXE_NAME@.exe"
+ VALUE "CompanyName", "HITLabNZ"
+ VALUE "LegalCopyright", "Copyright (C) 2007-2008 HIT Lab NZ, ARToolworks"
+ }
+ }
+}
+
+IDI_APPICON ICON "@CMAKE_SOURCE_DIR@/share/ARToolKit.ico"
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
