Skip to content

Commit a2a6f15

Browse files
authored
Merge pull request #118 from nim65s/cmake
sync submodule
2 parents 51e6dbf + 275a9a8 commit a2a6f15

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

CMakeLists.txt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# details. You should have received a copy of the GNU Lesser General Public
1313
# License along with hpp_tutorial If not, see <http://www.gnu.org/licenses/>.
1414

15-
cmake_minimum_required(VERSION 3.10)
15+
cmake_minimum_required(VERSION 3.22)
1616

1717
set(PROJECT_NAME hpp_tutorial)
1818
set(PROJECT_DESCRIPTION "Tutorial for humanoid path planner platform.")
@@ -32,14 +32,6 @@ else()
3232
TARGET jrl-cmakemodules::jrl-cmakemodules
3333
PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
3434
message(STATUS "JRL cmakemodules found on system at ${JRL_CMAKE_MODULES}")
35-
elseif(${CMAKE_VERSION} VERSION_LESS "3.14.0")
36-
message(
37-
FATAL_ERROR
38-
"\nCan't find jrl-cmakemodules. Please either:\n"
39-
" - use git submodule: 'git submodule update --init'\n"
40-
" - or install https://github.com/jrl-umi3218/jrl-cmakemodules\n"
41-
" - or upgrade your CMake version to >= 3.14 to allow automatic fetching\n"
42-
)
4335
else()
4436
message(STATUS "JRL cmakemodules not found. Let's fetch it.")
4537
include(FetchContent)
@@ -70,7 +62,6 @@ add_subdirectory(src)
7062
set(CATKIN_PACKAGE_SHARE_DESTINATION
7163
${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME})
7264

73-
install(FILES package.xml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
7465
install(
7566
FILES urdf/box.urdf
7667
urdf/cup.urdf
@@ -132,5 +123,3 @@ install(
132123
TARGETS ${PROJECT_NAME}
133124
EXPORT ${TARGETS_EXPORT_NAME}
134125
DESTINATION lib)
135-
136-
install(FILES package.xml DESTINATION share/${PROJECT_NAME})

cmake

Submodule cmake updated 384 files

0 commit comments

Comments
 (0)