[artoolkit-commits] SF.net SVN: artoolkit:[291] 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:[291] branches/hartmut-pre-2_8/artoolkit
|
From: <ret...@us...> - 2008-08-21 03:47:58
|
Revision: 291
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=291&view=rev
Author: retrakker
Date: 2008-08-21 03:48:04 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
- added utilities
- general cleanup of the buildsystem
- added documentation to the packaging
- added pattern files to the packaging
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/Packaging.cmake.in
branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/extlib/tinyxml/CMakeLists.txt
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/_ext/freeglut/src/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt
Added Paths:
-----------
branches/hartmut-pre-2_8/artoolkit/patterns/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/calib_camera2/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/calib_cparam/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/calib_distortion/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/graphicsTest/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/util/videoTest/CMakeLists.txt
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -19,6 +19,13 @@
set(ARTOOLKIT_VERSION_TINY 3)
set(ARTOOLKIT_VERSION_REV 99)
+set(ARTOOLKIT_VERSION_SHORT "${ARTOOLKIT_VERSION_MAJOR}.${ARTOOLKIT_VERSION_MINOR}")
+set(ARTOOLKIT_VERSION_FULL
+ "${ARTOOLKIT_VERSION_MAJOR}.${ARTOOLKIT_VERSION_MINOR}.${ARTOOLKIT_VERSION_TINY}"
+ )
+
+set(ARTOOLKIT_SHARE_FOLDER share/artoolkit-${ARTOOLKIT_VERSION_SHORT})
+
#
# Depending on what is available we work our way through
#
@@ -55,13 +62,18 @@
DESTINATION bin
PATTERN ".svn" EXCLUDE
)
+else(WIN32)
+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/Data
+ DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
+ PATTERN ".svn" EXCLUDE
+ )
endif(WIN32)
install(FILES
ChangeLog.txt
COPYING.txt
README.txt
- DESTINATION share/artoolkit_2
+ DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
)
if (APPLE)
@@ -88,8 +100,20 @@
add_subdirectory(util)
add_subdirectory(examples)
+#
+# Install the documentation
+#
+install(DIRECTORY doc
+ DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
+ PATTERN ".svn" EXCLUDE
+ )
#
+# Install the pattern files
+#
+add_subdirectory(patterns)
+
+#
# Optional packaging for SDK
#
option(ARTOOLKIT_BUILD_PACKAGE "Build distribution packages" OFF)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 03:48:04 UTC (rev 291)
@@ -1,21 +1,22 @@
# some simple macros to inject files into bundles
-MACRO(ARTOOLKIT_EXECUTABLE EXE_NAME SRCS)
- FILE(GLOB _datafiles "${CMAKE_SOURCE_DIR}/bin/Data/*.dat")
- FILE(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/*.xml")
- FILE(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/patt.*")
- IF(APPLE)
- SET_SOURCE_FILES_PROPERTIES(
+macro(artoolkit_executable EXE_NAME SRCS)
+ file(GLOB _datafiles "${CMAKE_SOURCE_DIR}/bin/Data/*.dat")
+ file(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/*.xml")
+ file(GLOB _datafiles ${_datafiles} "${CMAKE_SOURCE_DIR}/bin/Data/patt.*")
+
+ if(APPLE)
+ set_source_files_properties(
${_datafiles}
PROPERTIES
MACOSX_PACKAGE_LOCATION "Resources/Data"
)
- ADD_EXECUTABLE(${EXE_NAME} MACOSX_BUNDLE ${SRCS} ${_datafiles})
- ELSE(APPLE)
- ADD_EXECUTABLE(${EXE_NAME} ${SRCS} ${_datafiles})
- ENDIF(APPLE)
-ENDMACRO(ARTOOLKIT_EXECUTABLE)
+ add_executable(${EXE_NAME} MACOSX_BUNDLE ${${SRCS}} ${_datafiles})
+ else(APPLE)
+ add_executable(${EXE_NAME} ${${SRCS}} ${_datafiles})
+ endif(APPLE)
+endmacro(artoolkit_executable)
macro(artoolkit_lib_install target)
@@ -53,3 +54,84 @@
endmacro(artoolkit_exe_install target)
+
+macro(artoolkit_example_lite name source_files)
+
+ set(exe_name ${name})
+
+ include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
+
+ artoolkit_executable(${exe_name} ${source_files})
+
+ target_link_libraries(${exe_name}
+ AR
+ ARvideo
+ ARMulti
+ ARgsubUtil
+ ARgsub_lite
+ ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES}
+ )
+
+ set_target_properties(${exe_name}
+ PROPERTIES
+ PROJECT_LABEL "Example ${name}"
+ )
+
+ artoolkit_exe_install(${exe_name})
+
+endmacro(artoolkit_example_lite name source_files)
+
+
+macro(artoolkit_example_glut name source_files)
+
+ set(exe_name ${name})
+
+ include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
+
+ artoolkit_executable(${exe_name} ${source_files})
+
+ target_link_libraries(${exe_name}
+ AR
+ ARvideo
+ ARgsub
+ ARgsubUtil
+ ARMulti
+ ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES}
+ )
+
+ set_target_properties(${exe_name}
+ PROPERTIES
+ PROJECT_LABEL "Example ${name}"
+ )
+
+ artoolkit_exe_install(${exe_name})
+
+endmacro(artoolkit_example_glut name source_files)
+
+
+macro(artoolkit_utility_glut name source_files)
+
+ set(exe_name ${name})
+
+ include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
+
+ artoolkit_executable(${exe_name} ${source_files})
+
+ target_link_libraries(${exe_name}
+ AR
+ ARvideo
+ ARMulti
+ ARgsub
+ ARgsub_lite
+ ARgsubUtil
+ ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES}
+ )
+
+ set_target_properties(${exe_name}
+ PROPERTIES
+ PROJECT_LABEL "Utility ${name}"
+ )
+
+ artoolkit_exe_install(${exe_name})
+
+endmacro(artoolkit_utility_glut name source_files)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-21 03:48:04 UTC (rev 291)
@@ -18,23 +18,21 @@
set(CPACK_PACKAGE_VERSION_MINOR ${ARTOOLKIT_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${ARTOOLKIT_VERSION_TINY})
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "ARToolKit2SDK")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "ARToolKit-${ARTOOLKIT_VERSION_FULL}-SDK")
-set(CPACK_PACKAGE_EXECUTABLES "mk_patt;Make Pattern;simpleLite;Simple Example")
+set(CPACK_PACKAGE_EXECUTABLES "videoTest;Test Video Capture;graphicsTest;Test Graphics Hardware")
if(WIN32)
- #
- # For MSVC compilers (and probably others) we need to copy the runtime
- # to the plugins folder as well
- #
-
set(CPACK_NSIS_MENU_LINKS
- "bin" "ARToolKit application folder"
- "share/osgART/ChangeLog.txt" "ARToolKit 2.0 ChangeLog"
- "share/artoolkit2/README.txt" "ARToolKit ReadMe"
- "share/artoolkit2/COPYING.txt" "ARToolKit GPL2 License"
- "share/osgART/doc/html/index.html" "osgART 2.0 API Documentation"
+ "bin" "ARToolKit application folder"
+ "${ARTOOLKIT_SHARE_FOLDER}/ChangeLog.txt" "ARToolKit ${ARTOOLKIT_VERSION_FULL} ChangeLog"
+ "${ARTOOLKIT_SHARE_FOLDER}/README.txt" "ARToolKit ReadMe"
+ "${ARTOOLKIT_SHARE_FOLDER}/COPYING.txt" "ARToolKit GPL2 License"
+ "${ARTOOLKIT_SHARE_FOLDER}/doc/index.html" "ARToolKit API Documentation"
+ "${ARTOOLKIT_SHARE_FOLDER}/doc/video/index.html" "ARToolKit Video API Documentation"
+ "${ARTOOLKIT_SHARE_FOLDER}/doc/gsub_lite/index.html" "ARToolKit GL Subroutine API Documentation"
+ "${ARTOOLKIT_SHARE_FOLDER}/patterns" "ARToolKit Patterns"
"http://artoolkit.sourceforge.net" "ARToolKit website"
"http://www.hitlabnz.org" "HIT Lab NZ website"
"http://www.artoolworks.com" "ARToolworks website"
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -1,22 +1,60 @@
-SET(LIB_NAME AR)
+set(LIB_NAME AR)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+include_directories(${CMAKE_SOURCE_DIR}/include)
-CONFIGURE_FILE(
+configure_file(
${CMAKE_SOURCE_DIR}/include/${LIB_NAME}/config.h.in
${CMAKE_BINARY_DIR}/include/${LIB_NAME}/config.h
)
+
+set(SRCS
+ arDetectMarker.c
+ arDetectMarker2.c
+ arGetCode.c
+ arGetMarkerInfo.c
+ arGetTransMat.c
+ arGetTransMat2.c
+ arGetTransMat3.c
+ arGetTransMatCont.c
+ arLabeling.c
+ arUtil.c
+ mAlloc.c
+ mAllocDup.c
+ mAllocInv.c
+ mAllocMul.c
+ mAllocTrans.c
+ mAllocUnit.c
+ mDet.c
+ mDisp.c
+ mDup.c
+ mFree.c
+ mInv.c
+ mMul.c
+ mPCA.c
+ mSelfInv.c
+ mTrans.c
+ mUnit.c
+ paramChangeSize.c
+ paramDecomp.c
+ paramDisp.c
+ paramDistortion.c
+ paramFile.c
+ paramGet.c
+ vAlloc.c
+ vDisp.c
+ vFree.c
+ vHouse.c
+ vInnerP.c
+ vTridiag.c
+ )
-
-FILE(GLOB SRCS *.c)
-
-SET(HDRS ${HDRS}
+set(HDRS ${HDRS}
${CMAKE_BINARY_DIR}/include/AR/config.h
)
-SET(HDRS ${HDRS} ${CMAKE_SOURCE_DIR}/include/AR/ar.h)
+set(HDRS ${HDRS} ${CMAKE_SOURCE_DIR}/include/AR/ar.h)
-ADD_LIBRARY(${LIB_NAME} ${HDRS} ${SRCS})
+add_library(${LIB_NAME} ${SRCS} ${HDRS})
install(TARGETS AR
ARCHIVE DESTINATION lib
@@ -24,3 +62,10 @@
PUBLIC_HEADER DESTINATION include/AR
)
+
+install(FILES ${HDRS}
+ DESTINATION include/AR
+ )
+
+
+
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -1,9 +1,26 @@
-SET(LIB_NAME ARMulti)
+set(lib_name ARMulti)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+set(SRCS
+ arMultiActivate.c
+ arMultiGetTransMat.c
+ arMultiReadConfigFile.c
+ )
+
+include_directories(${CMAKE_SOURCE_DIR}/include)
-SET(HDRS ${CMAKE_SOURCE_DIR}/include/AR/arMulti.h)
+set(HDRS
+ ${CMAKE_SOURCE_DIR}/include/AR/arMulti.h
+ )
-FILE(GLOB SRCS *.c)
+add_library(${lib_name} STATIC ${HDRS} ${SRCS})
-ADD_LIBRARY(${LIB_NAME} ${HDRS} ${SRCS})
\ No newline at end of file
+install(TARGETS ${lib_name}
+ ARCHIVE DESTINATION lib
+ RUNTIME DESTINATION bin
+ PUBLIC_HEADER DESTINATION include/AR
+ )
+
+
+install(FILES ${HDRS}
+ DESTINATION include/AR
+ )
\ No newline at end of file
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -12,6 +12,26 @@
# GL utility
add_subdirectory(Gl)
+#
+# ARvideo headers - just install them
+#
+install(FILES
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoGStreamer.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoLinux1394Cam.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoLinuxDV.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoLinuxV4L.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoMacOSX.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoSGI.h
+ ${CMAKE_SOURCE_DIR}/include/AR/sys/videoWin32DirectShow.h
+ DESTINATION include/AR/sys
+ )
+
+install(FILES
+ ${CMAKE_SOURCE_DIR}/include/AR/video.h
+ DESTINATION include/AR
+ )
+
+
# Video
if(APPLE)
add_subdirectory(VideoMacOSX)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -5,6 +5,9 @@
if(GLUT_FOUND)
+ #
+ # ARgsub
+ #
set(LIB_NAME ARgsub)
include_directories(${CMAKE_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR})
@@ -21,6 +24,13 @@
include_directories(${CMAKE_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR})
+ install(FILES ${HDRS}
+ DESTINATION include/AR
+ )
+
+ #
+ # ARgsubUtil
+ #
set(LIB_NAME ARgsubUtil)
set(HDRS ${CMAKE_SOURCE_DIR}/include/AR/gsubUtil.h)
@@ -29,13 +39,21 @@
add_library(${LIB_NAME} ${HDRS} ${SRCS})
- target_link_libraries(${LIB_NAME} AR)
+ target_link_libraries(${LIB_NAME} AR)
-
artoolkit_lib_install(${LIB_NAME})
+ install(FILES ${HDRS}
+ DESTINATION include/AR
+ )
+
endif(GLUT_FOUND)
+
+#
+# ARgsub lite
+#
+
SET(LIB_NAME ARgsub_lite)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
@@ -50,6 +68,9 @@
artoolkit_lib_install(${LIB_NAME})
+install(FILES ${HDRS}
+ DESTINATION include/AR
+ )
@@ -57,3 +78,6 @@
+
+
+
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/extlib/tinyxml/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/extlib/tinyxml/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/extlib/tinyxml/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -13,9 +13,16 @@
tinystr.h
tinyxml.h
)
-
+
add_definitions(-DTIXML_USE_STL)
add_library(${lib_name} STATIC
${SRCS}
- )
\ No newline at end of file
+ )
+
+if(NOT CMAKE_PROJECT_NAME MATCHES "tinyxml")
+ set_target_properties(${lib_name}
+ PROPERTIES
+ PROJECT_LABEL "Dependency ${lib_name}"
+ )
+endif(NOT CMAKE_PROJECT_NAME MATCHES "tinyxml")
\ No newline at end of file
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-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoWin32DirectShow/_ext/dsvl-0.0.8h/src/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -30,6 +30,14 @@
add_library(DSVL SHARED ${SRCS})
+if(NOT CMAKE_PROJECT_NAME MATCHES "DSVL")
+ set_target_properties(DSVL
+ PROPERTIES
+ PROJECT_LABEL "Dependency DirectShow Video Library"
+ )
+endif(NOT CMAKE_PROJECT_NAME MATCHES "DSVL")
+
+
target_link_libraries(DSVL tinyxml ${DIRECTSHOW_LIBRARIES})
if (${CMAKE_BUILD_TYPE} MATCHES Debug)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/_ext/freeglut/src/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/_ext/freeglut/src/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/_ext/freeglut/src/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -54,6 +54,14 @@
add_library(${lib_name} SHARED ${srcs} ${hdrs} ${public_hdrs})
+
+if(NOT CMAKE_PROJECT_NAME MATCHES "FreeGLUT")
+ set_target_properties(${lib_name}
+ PROPERTIES
+ PROJECT_LABEL "Dependency ${lib_name}"
+ )
+endif(NOT CMAKE_PROJECT_NAME MATCHES "FreeGLUT")
+
target_link_libraries(${lib_name}
${OPENGL_LIBRARIES}
)
@@ -73,5 +81,7 @@
ARCHIVE DESTINATION lib
)
+install(FILES ${public_hdrs} DESTINATION include/GL)
+
\ No newline at end of file
Added: branches/hartmut-pre-2_8/artoolkit/patterns/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/patterns/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/patterns/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,21 @@
+##############################################################################
+# CMake build system for ARToolKit 2.7.x #
+# #
+# (c) Copyright 2007-2008, HITLabNZ, Hartmut Seichter #
+##############################################################################
+
+set(pattern_files
+ blankPatt.gif
+ calib_cpara.pdf
+ calib_dist.pdf
+ calibPatt.pdf
+ pattHiro.pdf
+ pattKanji.pdf
+ pattMulti.pdf
+ pattSample1.pdf
+ pattSample2.pdf
+ )
+
+install(FILES ${pattern_files}
+ DESTINATION ${ARTOOLKIT_SHARE_FOLDER}/patterns
+ )
Modified: branches/hartmut-pre-2_8/artoolkit/util/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/util/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -1 +1,7 @@
-ADD_SUBDIRECTORY(mk_patt)
+add_subdirectory(calib_camera2)
+add_subdirectory(calib_cparam)
+add_subdirectory(calib_distortion)
+add_subdirectory(graphicsTest)
+add_subdirectory(mk_patt)
+add_subdirectory(videoTest)
+
Added: branches/hartmut-pre-2_8/artoolkit/util/calib_camera2/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/calib_camera2/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/util/calib_camera2/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,8 @@
+set(srcs
+ calib_dist.c
+ calib_inp.c
+ main.c
+ calib_camera.h
+ )
+
+artoolkit_utility_glut(calib_camera2 srcs)
Added: branches/hartmut-pre-2_8/artoolkit/util/calib_cparam/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/calib_cparam/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/util/calib_cparam/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,7 @@
+set(srcs
+ calib_cparam.c
+ calib_cparam.h
+ calib_cparam_sub.c
+ )
+
+artoolkit_utility_glut(calib_cparam srcs)
Added: branches/hartmut-pre-2_8/artoolkit/util/calib_distortion/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/calib_distortion/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/util/calib_distortion/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,7 @@
+set(srcs
+ calib_dist.c
+ calib_dist.h
+ check_dist.c
+ )
+
+artoolkit_utility_glut(calib_distortion srcs)
Added: branches/hartmut-pre-2_8/artoolkit/util/graphicsTest/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/graphicsTest/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/util/graphicsTest/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,5 @@
+set(srcs
+ graphicsTest.c
+ )
+
+artoolkit_utility_glut(graphicsTest srcs)
Modified: branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt 2008-08-21 03:45:42 UTC (rev 290)
+++ branches/hartmut-pre-2_8/artoolkit/util/mk_patt/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -1,17 +1,5 @@
-SET(EXE_NAME mk_patt)
+set(srcs
+ mk_patt.c
+ )
-SET(SRCS mk_patt.c)
-
-if(GLUT_FOUND)
-
- add_definitions(${GLUT_DEFS})
-
- include_directories(${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-
- ARTOOLKIT_EXECUTABLE(${EXE_NAME} ${SRCS})
-
- target_link_libraries(${EXE_NAME} AR ARgsub_lite ARvideo ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
-
- artoolkit_exe_install(${EXE_NAME})
-
-endif(GLUT_FOUND)
+artoolkit_utility_glut(mk_patt srcs)
Added: branches/hartmut-pre-2_8/artoolkit/util/videoTest/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/util/videoTest/CMakeLists.txt (rev 0)
+++ branches/hartmut-pre-2_8/artoolkit/util/videoTest/CMakeLists.txt 2008-08-21 03:48:04 UTC (rev 291)
@@ -0,0 +1,5 @@
+set(srcs
+ videoTest.c
+ )
+
+artoolkit_utility_glut(videoTest srcs)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
