Skip to content

Commit 6c9e610

Browse files
authored
Merge pull request #1035 from Nobu19800/bugs/cmakepath
CMakeLists.txt内で定義したパスの末尾にスラッシュを付けないようにする
2 parents e471e6f + 10f210c commit 6c9e610

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,17 @@ if(MSVC)
8181
else()
8282
set(RTM_VC_VER "vc${MSVC_TOOLSET_VERSION}")
8383
endif()
84-
set(INSTALL_RTM_SCRIPT_DIR ${OPENRTM_VERSION}/bin/)
85-
set(INSTALL_RTM_BIN_DIR ${OPENRTM_VERSION}/bin/${RTM_VC_VER}/)
86-
set(INSTALL_RTM_INCLUDE_DIR ${OPENRTM_VERSION}/)
87-
set(INSTALL_COIL_INCLUDE_DIR ${OPENRTM_VERSION}/)
88-
set(INSTALL_RTM_LIB_DIR ${OPENRTM_VERSION}/bin/${RTM_VC_VER}/)
89-
set(INSTALL_RTM_EXAMPLE_DIR ${OPENRTM_VERSION}/Components/C++/Examples/${RTM_VC_VER}/)
84+
set(INSTALL_RTM_SCRIPT_DIR ${OPENRTM_VERSION}/bin)
85+
set(INSTALL_RTM_BIN_DIR ${OPENRTM_VERSION}/bin/${RTM_VC_VER})
86+
set(INSTALL_RTM_INCLUDE_DIR ${OPENRTM_VERSION})
87+
set(INSTALL_COIL_INCLUDE_DIR ${OPENRTM_VERSION})
88+
set(INSTALL_RTM_LIB_DIR ${OPENRTM_VERSION}/bin/${RTM_VC_VER})
89+
set(INSTALL_RTM_EXAMPLE_DIR ${OPENRTM_VERSION}/Components/C++/Examples/${RTM_VC_VER})
9090
set(INSTALL_RTM_EXAMPLE_SHAREDLIB_DIR ${INSTALL_RTM_EXAMPLE_DIR})
91-
set(INSTALL_RTM_DOC_DIR ${OPENRTM_VERSION}/docs/)
92-
set(INSTALL_RTM_EXT_DIR ${OPENRTM_VERSION}/ext/${RTM_VC_VER}/)
93-
set(INSTALL_RTM_CMAKE_DIR ${OPENRTM_VERSION}/cmake/)
94-
set(INSTALL_RTM_ETC_DIR ${OPENRTM_VERSION}/ext/)
91+
set(INSTALL_RTM_DOC_DIR ${OPENRTM_VERSION}/docs)
92+
set(INSTALL_RTM_EXT_DIR ${OPENRTM_VERSION}/ext/${RTM_VC_VER})
93+
set(INSTALL_RTM_CMAKE_DIR ${OPENRTM_VERSION}/cmake)
94+
set(INSTALL_RTM_ETC_DIR ${OPENRTM_VERSION}/ext)
9595
# For setting warning options manually, delete CMake default options.
9696
string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
9797
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

0 commit comments

Comments
 (0)