From 47e5f45cd55881fb1a4331faf5cc0c71a0c54cd1 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 14 Feb 2015 04:57:26 -0800 Subject: [PATCH 1/3] fix for shre/hrpsys/share link --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e68ef6d8390..24c07c2d745 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,8 +196,9 @@ endforeach()") install(DIRECTORY test launch DESTINATION share/hrpsys USE_SOURCE_PERMISSIONS) install(DIRECTORY rtc ec DESTINATION share/hrpsys/src USE_SOURCE_PERMISSIONS) install(CODE " -execute_process(COMMAND cmake -E make_directory share WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/hrpsys) -execute_process(COMMAND cmake -E create_symlink ../../hrpsys share/hrpsys WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/hrpsys) +execute_process(COMMAND cmake -E make_directory share/hrpsys WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/hrpsys) +execute_process(COMMAND cmake -E create_symlink ../../../hrpsys/idl share/hrpsys/idl WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/hrpsys) +execute_process(COMMAND cmake -E create_symlink ../../../hrpsys/samples share/hrpsys/samples WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/share/hrpsys) ") endif() if(need_catkin) From 8a14d3f50ec567663aeeb96b56e4f654d9202e20 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Sat, 14 Feb 2015 05:02:45 -0800 Subject: [PATCH 2/3] [CMakeLists.txt] RelWithDebInfo is not supported on hrpsys-base --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24c07c2d745..ea8a8e41d27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,7 @@ if(COMPILE_JAVA_STUFF) set(javac_flags -target ${Java_VERSION_MAJOR}.${Java_VERSION_MINOR} -d . -sourcepath src) endif() -if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL None) +if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL None OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo) set( CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." From 3ae735390b94e22db985537c90cdabe6ea6ef8be Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Thu, 5 Mar 2015 13:03:49 +0900 Subject: [PATCH 3/3] [CMakeLists.txt, idl/CMakeLists.txt] fix for deb building --- CMakeLists.txt | 2 +- idl/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea8a8e41d27..018d36cfd27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,7 +144,7 @@ execute_process( COMMAND python -c "from distutils import sysconfig; print sysconfig.get_config_var(\"VERSION\")" OUTPUT_VARIABLE PYTHON_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) -set(python_dist_pkg_dir ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/dist-packages) +set(python_dist_pkg_dir lib/python${PYTHON_VERSION}/dist-packages) configure_file(hrpsys-base.pc.in ${CMAKE_CURRENT_BINARY_DIR}/hrpsys-base.pc @ONLY) install(FILES diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index d161549336f..a301e091195 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -121,8 +121,8 @@ foreach(_idl_file ${openhrp_idl_files}) endif() endforeach() -install(CODE "execute_process(COMMAND omniidl -bpython -C${python_dist_pkg_dir}/hrpsys -I${OPENRTM_IDL_DIR} ${idl_files} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") -install(CODE "execute_process(COMMAND omniidl -bpython -C${python_dist_pkg_dir}/hrpsys -I${OPENRTM_IDL_DIR} ${openhrp_idl_files} WORKING_DIRECTORY ${OPENHRP_IDL_DIR}/OpenHRP)") +install(CODE "execute_process(COMMAND omniidl -bpython -C\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${python_dist_pkg_dir}/hrpsys -I${OPENRTM_IDL_DIR} ${idl_files} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") +install(CODE "execute_process(COMMAND omniidl -bpython -C\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${python_dist_pkg_dir}/hrpsys -I${OPENRTM_IDL_DIR} ${openhrp_idl_files} WORKING_DIRECTORY ${OPENHRP_IDL_DIR}/OpenHRP)") install(CODE "execute_process(COMMAND python -m compileall . WORKING_DIRECTORY ${python_dist_pkg_dir}/hrpsys)") install(FILES ${headers} DESTINATION include/hrpsys/idl) install(FILES ${idl_files} DESTINATION share/hrpsys/idl)