From 142979e52bfd2f07d3de6563eacab19c15879dcb Mon Sep 17 00:00:00 2001 From: Francois Bleibel <fbleibel@gmail.com> Date: Tue, 8 Jun 2010 11:16:28 +0900 Subject: [PATCH] Wrong file added to git repository (corrected). --- dynamicGraph.pc | 13 ------------- dynamicGraph.pc.cmake | 13 +++++++++++++ src/CMakeLists.txt | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 dynamicGraph.pc create mode 100644 dynamicGraph.pc.cmake diff --git a/dynamicGraph.pc b/dynamicGraph.pc deleted file mode 100644 index bc0de15..0000000 --- a/dynamicGraph.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/home/blue/sot-lib -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include -datarootdir=${prefix}/share -docdir=${datarootdir}/doc/dynamicGraph - -Name: dynamicGraph -Description: -Version: 1.0 -Requires: MatrixAbstractLayer >= 1.0, dynamicsJRLJapan >= 1.0, hrp2Dynamics >= 1.0, walkGenJrl >= 1.0 -Libs: -L${libdir} -Wl,-R${libdir} -ldynamicGraph -Cflags: -I${includedir} diff --git a/dynamicGraph.pc.cmake b/dynamicGraph.pc.cmake new file mode 100644 index 0000000..1810450 --- /dev/null +++ b/dynamicGraph.pc.cmake @@ -0,0 +1,13 @@ +prefix=${CMAKE_INSTALL_PREFIX} +exec_prefix=${install_pkg_prefix} +libdir=${install_pkg_exec_prefix}/lib +includedir=${install_pkg_prefix}/include +datarootdir=${install_pkg_prefix}/share +docdir=${install_pkg_datarootdir}/doc/${PROJECT_NAME} + +Name: ${PROJECT_NAME} +Description: +Version: ${PROJECT_VERSION} +Requires: ${PACKAGE_REQUIREMENTS} +Libs: ${LIBDIR_KW}${install_pkg_libdir} ${${PROJECT_NAME}_LDFLAGS} +Cflags: -I${install_pkg_include_dir} ${${PROJECT_NAME}_CXXFLAGS} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 575e709..4322d28 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -77,7 +77,7 @@ INCLUDE(debug/SourcesLib.cmake) INCLUDE(dgraph/SourcesLib.cmake) INCLUDE(signal/SourcesLib.cmake) INCLUDE(exception/SourcesLib.cmake) -MESSAGE("Install prefix = ${CMAKE_INSTALL_PREFIX}") + # ------------------------------------------------------------- # --- HEADERS ------------------------------------------------- # ------------------------------------------------------------- -- GitLab