File correct-install-path.patch of Package ARToolKitPlus

Overview Repositories Revisions Requests Users Attributes Meta

File correct-install-path.patch of Package ARToolKitPlus

diff -Nur ARToolKitPlus-2.3.1/bin/CMakeLists.txt new/bin/CMakeLists.txt
--- ARToolKitPlus-2.3.1/bin/CMakeLists.txt	2014-10-05 21:46:01.000000000 +0200
+++ new/bin/CMakeLists.txt	2021-03-22 08:24:43.324129514 +0100
@@ -18,6 +18,9 @@
 add_executable(idpatgen ${PAT_GEN_DIR}/main.cpp ${PAT_GEN_DIR}/PN/Image.cpp ${PAT_GEN_DIR}/PN/ImageTool.cpp)
 target_link_libraries(idpatgen ARToolKitPlus)
 
+install(TARGETS idpatgen patt2ppm ppm2patt
+        RUNTIME DESTINATION bin)
+
 # test program
 add_executable(test ${AR_SOURCE_DIR}/tools/test/main.cpp)
 target_link_libraries(test ARToolKitPlus)
diff -Nur ARToolKitPlus-2.3.1/CMakeLists.txt new/CMakeLists.txt
--- ARToolKitPlus-2.3.1/CMakeLists.txt	2014-10-05 21:46:01.000000000 +0200
+++ new/CMakeLists.txt	2021-03-22 08:32:21.208218405 +0100
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
-project(ARToolKitPlus)
+cmake_policy(SET CMP0048 NEW)
+
+project(ARToolKitPlus VERSION 2.3.1)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
@@ -32,6 +34,8 @@
 	)
 
 add_library(ARToolKitPlus SHARED ${HEADERS_AR} ${SOURCES_AR})
+set_target_properties(ARToolKitPlus PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(ARToolKitPlus PROPERTIES SOVERSION 2)
 
 if(ARTK_BUILD_EXAMPLES)
     add_subdirectory(bin/)
@@ -39,9 +43,8 @@
 
 # make install
 install(TARGETS ARToolKitPlus 
-LIBRARY DESTINATION lib  
-ARCHIVE DESTINATION lib
-RUNTIME DESTINATION bin)
+	LIBRARY DESTINATION "lib${LIB_SUFFIX}"
+	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 install(DIRECTORY include/ DESTINATION include)

Places

File correct-install-path.patch of Package ARToolKitPlus

Places