Skip to content
Snippets Groups Projects
Commit bbc6fb40 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/parametric-curves] Update to v1.2.1

Changes since v1.2.0:
- fix overflow
- clean cmake

Packaging changes:
- add patch aa, to avoid header installation
- add patches ab, ad from py-pinocchio, to avoid main headers and .pc
  installation
parent be39296e
No related branches found
No related tags found
No related merge requests found
......@@ -4,7 +4,7 @@
ORG= stack-of-tasks
NAME= parametric-curves
VERSION= 1.2.0
VERSION= 1.2.1
DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${DISTNAME}
......
SHA1 (parametric-curves-1.2.0.tar.gz) = faf5fdb5dc9862606aeca9115ee104f5bb71336e
RMD160 (parametric-curves-1.2.0.tar.gz) = b5a0a63561fed8bb28781ddec251b0449b915ce0
Size (parametric-curves-1.2.0.tar.gz) = 820754 bytes
SHA1 (parametric-curves-1.2.1.tar.gz) = 04104a51bc8e30607a76e1bed7a21599759d9a26
RMD160 (parametric-curves-1.2.1.tar.gz) = 2114c487d5850bb02704be68f59e7a3c9322960c
Size (parametric-curves-1.2.1.tar.gz) = 831921 bytes
SHA1 (patch-aa) = c18abc7658e72dec73e87dcdaccd648053f755ac
SHA1 (patch-ab) = fc473d24ad8e05f11bd908d2274adc685f817456
SHA1 (patch-ad) = 9731f90f2c33abec026a1d34cfaa653316b84427
don't install main headers
--- CMakeLists.txt.orig 2019-03-05 14:16:01.000000000 +0100
+++ CMakeLists.txt 2019-03-05 14:40:34.854771244 +0100
@@ -43,7 +43,6 @@
ADD_SUBDIRECTORY(python)
ENDIF(BUILD_PYTHON_INTERFACE)
-ADD_SUBDIRECTORY (include/${PROJECT_NAME})
ADD_SUBDIRECTORY (src/tests/spline_test)
ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})
Don't install the .pc file, which is already installed by the main project
--- cmake/base.cmake.orig 2018-07-11 10:41:37.000000000 +0200
+++ cmake/base.cmake 2018-12-13 14:15:46.772836002 +0100
@@ -226,7 +226,7 @@
# finalize the project setup.
#
MACRO(SETUP_PROJECT_FINALIZE)
- _SETUP_PROJECT_PKG_CONFIG_FINALIZE()
+ #_SETUP_PROJECT_PKG_CONFIG_FINALIZE()
_SETUP_PROJECT_DOCUMENTATION_FINALIZE()
_SETUP_PROJECT_HEADER_FINAlIZE()
_SETUP_DEBIAN()
Don't install main headers
--- cmake/header.cmake~ 2017-10-26 15:25:19.000000000 +0200
+++ cmake/header.cmake 2018-04-26 18:37:42.582417765 +0200
@@ -92,11 +92,6 @@
${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/deprecated.${PROJECT_CUSTOM_HEADER_EXTENSION}
@ONLY
)
- INSTALL(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/deprecated.${PROJECT_CUSTOM_HEADER_EXTENSION}
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
- )
# Generate warning.hh header.
CONFIGURE_FILE(
${PROJECT_SOURCE_DIR}/cmake/warning.hh.cmake
@@ -104,11 +99,6 @@
@ONLY
)
- INSTALL(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/warning.${PROJECT_CUSTOM_HEADER_EXTENSION}
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
- )
# Generate config.h header.
@@ -150,11 +140,6 @@
@ONLY
)
# Install it.
- INSTALL(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/${FILENAME}
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
- )
ENDFUNCTION(GENERATE_CONFIGURATION_HEADER)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment