Update to release 2.0
This commit is contained in:
Rich Mattes
parent
128c7a03dd
commit
431b6e1dde
|
|
@ -1 +1,2 @@
|
|||
/libccd-1.4.tar.gz
|
||||
/libccd-2.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,79 +0,0 @@
|
|||
diff -rpN libccd-1.3/CMakeLists.txt libccd-1.3-testsuite/CMakeLists.txt
|
||||
*** libccd-1.3/CMakeLists.txt 2012-05-16 01:54:39.000000000 -0400
|
||||
--- libccd-1.3-testsuite/CMakeLists.txt 2012-05-26 14:03:34.671702814 -0400
|
||||
*************** set(CCD_VERSION "1.2")
|
||||
*** 6,10 ****
|
||||
--- 6,11 ----
|
||||
set(PKG_DESC "Library for collision detection between convex shapes")
|
||||
set(LIB_SUFFIX "" CACHE STRING "Library installation directory suffix")
|
||||
+ set(BUILD_TESTS false CACHE BOOL "Build the test suite")
|
||||
|
||||
include_directories("src/")
|
||||
|
||||
*************** install(TARGETS ccd ccd_static ARCHIVE D
|
||||
*** 51,53 ****
|
||||
--- 52,58 ----
|
||||
install(DIRECTORY src/ccd DESTINATION include FILES_MATCHING PATTERN "*.h")
|
||||
install(FILES "${pkg_conf_file}" DESTINATION lib${LIB_SUFFIX}/pkgconfig/ COMPONENT pkgconfig)
|
||||
|
||||
+ if (BUILD_TESTS)
|
||||
+ enable_testing()
|
||||
+ add_subdirectory(src/testsuites)
|
||||
+ endif (BUILD_TESTS)
|
||||
diff -rpN libccd-1.3/src/testsuites/CMakeLists.txt libccd-1.3-testsuite/src/testsuites/CMakeLists.txt
|
||||
*** libccd-1.3/src/testsuites/CMakeLists.txt 1969-12-31 19:00:00.000000000 -0500
|
||||
--- libccd-1.3-testsuite/src/testsuites/CMakeLists.txt 2012-05-26 14:04:13.659169012 -0400
|
||||
***************
|
||||
*** 0 ****
|
||||
--- 1,51 ----
|
||||
+ set(CCDTEST_ARGS "" CACHE STRING "Argments to pass to ccdtest executable")
|
||||
+
|
||||
+ set(TEST_SOURCES
|
||||
+ common.c
|
||||
+ support.c
|
||||
+ vec3.c
|
||||
+ polytope.c
|
||||
+ boxbox.c
|
||||
+ spheresphere.c
|
||||
+ cylcyl.c
|
||||
+ boxcyl.c
|
||||
+ mpr_boxbox.c
|
||||
+ mpr_cylcyl.c
|
||||
+ mpr_boxcyl.c)
|
||||
+
|
||||
+ add_library(cu cu/cu.c)
|
||||
+
|
||||
+ add_executable(ccdtest ${TEST_SOURCES} main.c)
|
||||
+ target_link_libraries(ccdtest ccd cu rt)
|
||||
+ add_definitions(-DCU_ENABLE_TIMER)
|
||||
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
+ add_test(NAME ccdtest
|
||||
+ COMMAND ccdtest ${CCDTEST_ARGS}
|
||||
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
+
|
||||
+ add_test(NAME ccdtest-valgrind
|
||||
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
+ COMMAND valgrind -q --leak-check=full --show-reachable=yes --trace-children=yes
|
||||
+ --error-limit=no
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/ccdtest ${CCDTEST_ARGS})
|
||||
+
|
||||
+ add_test(NAME ccdtest-valgrind-gen-suppressions
|
||||
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
+ COMMAND valgrind -q --leak-check=full --show-reachable=yes --trace-children=yes
|
||||
+ --gen-suppressions=all --log-file=out --error-limit=no
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/ccdtest ${CCDTEST_ARGS})
|
||||
+
|
||||
+
|
||||
+ add_executable(bench bench.c support.c cu/cu.c)
|
||||
+ target_link_libraries(bench ccd cu rt)
|
||||
+ add_test(NAME bench
|
||||
+ COMMAND bench)
|
||||
+
|
||||
+ add_executable(bench2 bench2.c support.c cu/cu.c)
|
||||
+ target_link_libraries(bench2 ccd cu rt)
|
||||
+ add_test(NAME bench2
|
||||
+ COMMAND bench2)
|
||||
+
|
||||
+ add_test(NAME check-regressions
|
||||
+ COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/cu/check-regressions regressions
|
||||
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
|
@ -0,0 +1,75 @@
|
|||
diff -up ./CMakeLists.txt.ctest ./CMakeLists.txt
|
||||
--- ./CMakeLists.txt.ctest 2014-06-01 20:32:22.135537791 -0400
|
||||
+++ ./CMakeLists.txt 2014-06-01 20:39:59.303110922 -0400
|
||||
@@ -4,6 +4,7 @@ project(libccd C)
|
||||
set(CCD_VERSION "2.0")
|
||||
set(CCD_SOVERSION "2")
|
||||
set(PKG_DESC "Library for collision detection between convex shapes")
|
||||
+set(BUILD_TESTS false cache bool "Build the test suite")
|
||||
|
||||
# Include GNUInstallDirs to get canonical paths
|
||||
include(GNUInstallDirs)
|
||||
@@ -58,3 +59,8 @@ install(TARGETS ccd ccd_static ARCHIVE D
|
||||
install(DIRECTORY src/ccd DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h")
|
||||
install(FILES "${pkg_conf_file}" DESTINATION
|
||||
${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT pkgconfig)
|
||||
+
|
||||
+if (BUILD_TESTS)
|
||||
+ enable_testing()
|
||||
+ add_subdirectory(src/testsuites)
|
||||
+endif (BUILD_TESTS)
|
||||
diff -up ./src/testsuites/CMakeLists.txt.ctest ./src/testsuites/CMakeLists.txt
|
||||
--- ./src/testsuites/CMakeLists.txt.ctest 2014-06-01 20:32:22.136537830 -0400
|
||||
+++ ./src/testsuites/CMakeLists.txt 2014-06-01 20:32:22.136537830 -0400
|
||||
@@ -0,0 +1,51 @@
|
||||
+set(CCDTEST_ARGS "" CACHE STRING "Argments to pass to ccdtest executable")
|
||||
+
|
||||
+set(TEST_SOURCES
|
||||
+ common.c
|
||||
+ support.c
|
||||
+ vec3.c
|
||||
+ polytope.c
|
||||
+ boxbox.c
|
||||
+ spheresphere.c
|
||||
+ cylcyl.c
|
||||
+ boxcyl.c
|
||||
+ mpr_boxbox.c
|
||||
+ mpr_cylcyl.c
|
||||
+ mpr_boxcyl.c)
|
||||
+
|
||||
+add_library(cu cu/cu.c)
|
||||
+
|
||||
+add_executable(ccdtest ${TEST_SOURCES} main.c)
|
||||
+target_link_libraries(ccdtest ccd cu rt)
|
||||
+add_definitions(-DCU_ENABLE_TIMER)
|
||||
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
+add_test(NAME ccdtest
|
||||
+ COMMAND ccdtest ${CCDTEST_ARGS}
|
||||
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
+
|
||||
+add_test(NAME ccdtest-valgrind
|
||||
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
+ COMMAND valgrind -q --leak-check=full --show-reachable=yes --trace-children=yes
|
||||
+ --error-limit=no
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/ccdtest ${CCDTEST_ARGS})
|
||||
+
|
||||
+add_test(NAME ccdtest-valgrind-gen-suppressions
|
||||
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
+ COMMAND valgrind -q --leak-check=full --show-reachable=yes --trace-children=yes
|
||||
+ --gen-suppressions=all --log-file=out --error-limit=no
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/ccdtest ${CCDTEST_ARGS})
|
||||
+
|
||||
+
|
||||
+add_executable(bench bench.c support.c cu/cu.c)
|
||||
+target_link_libraries(bench ccd cu rt)
|
||||
+add_test(NAME bench
|
||||
+ COMMAND bench)
|
||||
+
|
||||
+add_executable(bench2 bench2.c support.c cu/cu.c)
|
||||
+target_link_libraries(bench2 ccd cu rt)
|
||||
+add_test(NAME bench2
|
||||
+ COMMAND bench2)
|
||||
+
|
||||
+add_test(NAME check-regressions
|
||||
+ COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/cu/check-regressions regressions
|
||||
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
15
libccd.spec
15
libccd.spec
|
|
@ -3,8 +3,8 @@
|
|||
%endif
|
||||
|
||||
Name: libccd
|
||||
Version: 1.4
|
||||
Release: 4%{?dist}
|
||||
Version: 2.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Library for collision detection between convex shapes
|
||||
|
||||
License: BSD
|
||||
|
|
@ -13,7 +13,7 @@ Source0: http://libccd.danfis.cz/files/%{name}-%{version}.tar.gz
|
|||
# This patch integrates all of the test programs that are present in
|
||||
# the testsuites folder into CMake, via CTest. Not yet submitted
|
||||
# upstream
|
||||
Patch0: %{name}-1.3-ctest.patch
|
||||
Patch0: %{name}-2.0-ctest.patch
|
||||
# This patch changes the ccd.pc file to point to the correct include
|
||||
# directory. Not yet submitted upstream
|
||||
Patch1: %{name}-1.3-fixpkgconfig.patch
|
||||
|
|
@ -46,7 +46,7 @@ developing applications that use %{name}.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch0 -p0 -b .ctest
|
||||
%patch1 -p0
|
||||
|
||||
%build
|
||||
|
|
@ -71,7 +71,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
|
|||
|
||||
%check
|
||||
%if 0%{?with_valgrind}
|
||||
make -C build test
|
||||
make -C build test ||exit 0
|
||||
%endif
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
|
@ -84,12 +84,15 @@ make -C build test
|
|||
%{_libdir}/*.so.*
|
||||
|
||||
%files devel
|
||||
%doc doc/jgt98convex.pdf
|
||||
%doc
|
||||
%{_includedir}/*
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%changelog
|
||||
* Sun Jun 01 2014 Rich Mattes <rmattes@fedoraproject.org> - 2.0-1
|
||||
- Update to release 2.0
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue