[artoolkit-commits] SF.net SVN: artoolkit:[301] branches/hartmut-pre-2_8/artoolkit
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
|
From: <ret...@us...> - 2008-08-25 02:03:19
|
Revision: 301
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=301&view=rev
Author: retrakker
Date: 2008-08-25 02:03:29 +0000 (Mon, 25 Aug 2008)
Log Message:
-----------
- added PIC (position independent code) flag for GCC based compilers
this is necessary for ia64/x86_64 and is recommended for x86
also for static libraries
- added missing headers to the sourcecode packager
- correct issues with rpath setting on Unix
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/lib/SRC/AR/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-24 22:04:24 UTC (rev 300)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeLists.txt 2008-08-25 02:03:29 UTC (rev 301)
@@ -26,7 +26,16 @@
set(ARTOOLKIT_SHARE_FOLDER share/artoolkit-${ARTOOLKIT_VERSION_SHORT})
+
#
+# apply the RPATH to be used when installing, necessary to help the
+# dynamic library finding libs on ia64 systems
+#
+if(UNIX AND NOT APPLE)
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+endif(UNIX AND NOT APPLE)
+
+#
# Depending on what is available we work our way through
#
find_package(OpenGL)
Modified: branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-24 22:04:24 UTC (rev 300)
+++ branches/hartmut-pre-2_8/artoolkit/CMakeModules/ARToolKitHelper.cmake 2008-08-25 02:03:29 UTC (rev 301)
@@ -100,12 +100,20 @@
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 MATCHES 2.6)
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 MATCHES 2.6)
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-24 22:04:24 UTC (rev 300)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/AR/CMakeLists.txt 2008-08-25 02:03:29 UTC (rev 301)
@@ -52,14 +52,22 @@
${CMAKE_BINARY_DIR}/include/AR/config.h
)
-set(HDRS ${HDRS} ${CMAKE_SOURCE_DIR}/include/AR/ar.h)
+list(APPEND HDRS
+ ${CMAKE_SOURCE_DIR}/include/AR/ar.h
+ ${CMAKE_SOURCE_DIR}/include/AR/param.h
+ ${CMAKE_SOURCE_DIR}/include/AR/matrix.h
+ )
+if(NOT WIN32)
+ add_definitions(-fPIC)
+endif(NOT WIN32)
+
add_library(${LIB_NAME} ${SRCS} ${HDRS})
artoolkit_install(${LIB_NAME})
install(FILES ${HDRS}
- DESTINATION include/AR
+ DESTINATION include/AR
)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-24 22:04:24 UTC (rev 300)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/CMakeLists.txt 2008-08-25 02:03:29 UTC (rev 301)
@@ -5,6 +5,15 @@
##############################################################################
+#
+# On gcc we need position independent code for the libraries
+# this is required for x86_64 and recommended for x86
+#
+if(UNIX AND NOT APPLE)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC" )
+endif(UNIX AND NOT APPLE)
+
+
# Core library
add_subdirectory(AR)
add_subdirectory(ARMulti)
Modified: branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt
===================================================================
--- branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt 2008-08-24 22:04:24 UTC (rev 300)
+++ branches/hartmut-pre-2_8/artoolkit/lib/SRC/VideoGStreamer/CMakeLists.txt 2008-08-25 02:03:29 UTC (rev 301)
@@ -17,3 +17,11 @@
AR
${GSTREAMER_LIBRARIES}
)
+
+set_target_properties(${LIB_NAME} PROPERTIES
+ VERSION ${ARTOOLKIT_VERSION_FULL}
+ SOVERSION ${ARTOOLKIT_VERSION_SHORT}
+ )
+
+artoolkit_install(${LIB_NAME})
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|