[artoolkit-commits] SF.net SVN: artoolkit:[295] 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:[295] branches/hartmut-pre-2_8/artoolkit
|
From: <ret...@us...> - 2008-08-21 21:33:37
|
Revision: 295
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=295&view=rev
Author: retrakker
Date: 2008-08-21 21:33:47 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Updated CMake buildsystem for Linux systems with GStreamer installed
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/Gl/CMakeLists.txt
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-21 21:33:47 UTC (rev 295)
@@ -31,8 +31,8 @@
#
find_package(OpenGL)
find_package(GLUT)
+find_package(GStreamer)
-
#
# Preset some of the output directories
#
@@ -68,12 +68,13 @@
if(WIN32)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/Data
DESTINATION bin
- PATTERN ".svn" EXCLUDE
+ PATTERN ".svn" EXCLUDE
)
else(WIN32)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/Data
DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
- PATTERN ".svn" EXCLUDE
+ PATTERN ".svn" EXCLUDE
+ PATTERN "WDM_camera_*" EXCLUDE
)
endif(WIN32)
@@ -84,14 +85,10 @@
DESTINATION ${ARTOOLKIT_SHARE_FOLDER}
)
-if (UNIX)
- set(USE_GSTREAMER 0)
-
- include(FindGStreamer)
-
- if(GSTREAMER_FOUND)
+if(UNIX)
+ if(GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES)
SET(USE_GSTREAMER 1)
- endif(GSTREAMER_FOUND)
+ endif(GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES)
endif(UNIX)
# right order of include files is important
@@ -116,6 +113,19 @@
#
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
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
+
#
# Optional packaging for SDK
#
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-21 21:33:47 UTC (rev 295)
@@ -1,31 +1,38 @@
# some simple macros to inject files into bundles
+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_data2
+ ${CMAKE_SOURCE_DIR}/bin/Data/paddle_data
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.hiro
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.kanji
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.sample1
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.sample2
+ ${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
+ ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera_flipV.xml
+ ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml
+)
+
+set(ARTOOLKIT_FILES_DATA_WIN32
+ ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera_flipV.xml
+ ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml
+)
+
+set(ARTOOLKIT_FILES_DATA_MULTI
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/marker.dat
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.a
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.b
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.c
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.d
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.f
+ ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.g
+)
+
+
macro(artoolkit_executable EXE_NAME SRCS)
- set(_datafiles
- ${CMAKE_SOURCE_DIR}/bin/Data/camera_para.dat
- ${CMAKE_SOURCE_DIR}/bin/Data/object_data
- ${CMAKE_SOURCE_DIR}/bin/Data/object_data2
- ${CMAKE_SOURCE_DIR}/bin/Data/paddle_data
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.hiro
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.kanji
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.sample1
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.sample2
- ${CMAKE_SOURCE_DIR}/bin/Data/patt.calib
- ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera_flipV.xml
- ${CMAKE_SOURCE_DIR}/bin/Data/WDM_camera.xml
- )
-
- set(_datafiles_multi
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/marker.dat
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.a
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.b
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.c
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.d
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.f
- ${CMAKE_SOURCE_DIR}/bin/Data/multi/patt.g
- )
-
+
if(APPLE)
set(MACOSX_BUNDLE_BUNDLE_NAME ${EXE_NAME})
@@ -41,30 +48,30 @@
MACOSX_PACKAGE_LOCATION "Resources"
)
set_source_files_properties(
- ${_datafiles}
+ ${ARTOOLKIT_FILES_DATA}
PROPERTIES
HEADER_FILE_ONLY TRUE
MACOSX_PACKAGE_LOCATION "Resources/Data"
)
set_source_files_properties(
- ${_datafiles_multi}
+ ${ARTOOLKIT_FILES_DATA_MULTI}
PROPERTIES
HEADER_FILE_ONLY TRUE
MACOSX_PACKAGE_LOCATION "Resources/Data/multi"
)
add_executable(${EXE_NAME} MACOSX_BUNDLE
- ${${SRCS}} ${_datafiles} ${_datafiles_multi}
- ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
+ ${${SRCS}} ${CMAKE_SOURCE_DIR}/share/ARToolKit.icns
)
else(APPLE)
- add_executable(${EXE_NAME} ${${SRCS}} ${_datafiles} ${_datafiles_multi})
+ add_executable(${EXE_NAME} ${${SRCS}})
endif(APPLE)
endmacro(artoolkit_executable)
-macro(artoolkit_lib_install target)
+macro(artoolkit_install target)
+
if (WIN32)
set(lib_dest bin)
else (WIN32)
@@ -72,34 +79,35 @@
endif(WIN32)
+ if (CMAKE_VERSION MATCHES 2.6)
install(TARGETS ${target}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION ${lib_dest}
RUNTIME DESTINATION bin
PUBLIC_HEADER DESTINATION include/AR
)
-
-endmacro(artoolkit_lib_install target)
-
-macro(artoolkit_exe_install target)
-
- if (WIN32)
- set(lib_dest bin)
- else (WIN32)
- set(lib_dest lib)
- endif(WIN32)
-
+ elseif(CMAKE_VERSION MATCHES 2.6)
install(TARGETS ${target}
ARCHIVE DESTINATION lib
LIBRARY DESTINATION ${lib_dest}
RUNTIME DESTINATION bin
PUBLIC_HEADER DESTINATION include/AR
- BUNDLE DESTINATION /Applications/ARToolKit-${ARTOOLKIT_VERSION_FULL}
)
+ endif(CMAKE_VERSION MATCHES 2.6)
-endmacro(artoolkit_exe_install target)
+endmacro(artoolkit_install target)
+
+macro(artoolkit_lib_install target)
+
+ artoolkit_install(target)
+
+endmacro(artoolkit_lib_install target)
+
+
+
+
macro(artoolkit_example_lite name source_files)
set(exe_name ${name})
@@ -122,7 +130,7 @@
PROJECT_LABEL "Example ${name}"
)
- artoolkit_exe_install(${exe_name})
+ artoolkit_install(${exe_name})
endmacro(artoolkit_example_lite name source_files)
@@ -149,7 +157,7 @@
PROJECT_LABEL "Example ${name}"
)
- artoolkit_exe_install(${exe_name})
+ artoolkit_install(${exe_name})
endmacro(artoolkit_example_glut name source_files)
@@ -177,7 +185,7 @@
PROJECT_LABEL "Utility ${name}"
)
- artoolkit_exe_install(${exe_name})
+ artoolkit_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 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/Packaging.cmake.in 2008-08-21 21:33:47 UTC (rev 295)
@@ -49,7 +49,14 @@
if (APPLE)
# only use the PackageMaker version on Mac
set(CPACK_GENERATOR "PackageMaker")
- endif(APPLE)
+ elif(APPLE)
+ # use the source and deb package generators if possible
+ set(CPACK_GENERATOR "STGZ;TGZ;DEB")
+
+ # need to set proper dependencies
+ # set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.3.1-6), libgcc1 (>= 1:3.4.2-12)")
+
+ endif(APPLE)
endif(WIN32)
#
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 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt 2008-08-21 21:33:47 UTC (rev 295)
@@ -56,13 +56,8 @@
add_library(${LIB_NAME} ${SRCS} ${HDRS})
-install(TARGETS AR
- ARCHIVE DESTINATION lib
- RUNTIME DESTINATION bin
- PUBLIC_HEADER DESTINATION include/AR
- )
+artoolkit_install(${LIB_NAME})
-
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 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/ARMulti/CMakeLists.txt 2008-08-21 21:33:47 UTC (rev 295)
@@ -14,13 +14,9 @@
add_library(${lib_name} STATIC ${HDRS} ${SRCS})
-install(TARGETS ${lib_name}
- ARCHIVE DESTINATION lib
- RUNTIME DESTINATION bin
- PUBLIC_HEADER DESTINATION include/AR
- )
-
+
+artoolkit_install(${lib_name})
install(FILES ${HDRS}
DESTINATION include/AR
- )
\ No newline at end of file
+ )
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 20:39:35 UTC (rev 294)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/Gl/CMakeLists.txt 2008-08-21 21:33:47 UTC (rev 295)
@@ -20,7 +20,7 @@
target_link_libraries(${LIB_NAME} AR ${OPENGL_LIBRARY} ${GLUT_LIBRARIES})
- artoolkit_lib_install(${LIB_NAME})
+ artoolkit_install(${LIB_NAME})
include_directories(${CMAKE_SOURCE_DIR}/include ${GLUT_INCLUDE_DIR})
@@ -41,7 +41,7 @@
target_link_libraries(${LIB_NAME} AR)
- artoolkit_lib_install(${LIB_NAME})
+ artoolkit_install(${LIB_NAME})
install(FILES ${HDRS}
DESTINATION include/AR
@@ -66,7 +66,7 @@
TARGET_LINK_LIBRARIES(${LIB_NAME} AR)
-artoolkit_lib_install(${LIB_NAME})
+artoolkit_install(${LIB_NAME})
install(FILES ${HDRS}
DESTINATION include/AR
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
