Skip to content

Commit be49a3e

Browse files
authored
Merge pull request #213 from nim65s/cmake
sync submodule
2 parents 34443c5 + 20fce03 commit be49a3e

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

CMakeLists.txt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2424
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525

26-
cmake_minimum_required(VERSION 3.10)
26+
cmake_minimum_required(VERSION 3.22)
2727

2828
set(PROJECT_NAME hpp-manipulation)
2929
set(PROJECT_DESCRIPTION "Classes for manipulation planning.")
@@ -43,14 +43,6 @@ else()
4343
TARGET jrl-cmakemodules::jrl-cmakemodules
4444
PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
4545
message(STATUS "JRL cmakemodules found on system at ${JRL_CMAKE_MODULES}")
46-
elseif(${CMAKE_VERSION} VERSION_LESS "3.14.0")
47-
message(
48-
FATAL_ERROR
49-
"\nCan't find jrl-cmakemodules. Please either:\n"
50-
" - use git submodule: 'git submodule update --init'\n"
51-
" - or install https://github.com/jrl-umi3218/jrl-cmakemodules\n"
52-
" - or upgrade your CMake version to >= 3.14 to allow automatic fetching\n"
53-
)
5446
else()
5547
message(STATUS "JRL cmakemodules not found. Let's fetch it.")
5648
include(FetchContent)
@@ -191,5 +183,3 @@ if(BUILD_TESTING)
191183
endif()
192184

193185
pkg_config_append_libs(${PROJECT_NAME})
194-
195-
install(FILES package.xml DESTINATION share/${PROJECT_NAME})

cmake

Submodule cmake updated 384 files

0 commit comments

Comments
 (0)