From 5d979831253d1c0bd0a91ad3bffedd6f24e8b5c5 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 27 Nov 2019 17:44:38 +0100 Subject: [PATCH] [CMake] sync submodule --- CMakeLists.txt | 16 +++++++--------- cmake | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a95719f..97208ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,22 +17,22 @@ # hpp-gui If not, see # . -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + +SET(PROJECT_NAME "hpp-gui") +SET(PROJECT_DESCRIPTION "Graphical interface for HPP ") SET(CXX_DISABLE_WERROR TRUE) -INCLUDE(cmake/base.cmake) -INCLUDE(cmake/boost.cmake) INCLUDE(cmake/hpp.cmake) +INCLUDE(cmake/boost.cmake) INCLUDE(cmake//python.cmake) # Tells pkg-config to read qtversion and cmake_plugin from pkg config file. LIST(APPEND PKG_CONFIG_ADDITIONAL_VARIABLES qtversion cmake_plugin) -SET(PROJECT_NAME "hpp-gui") -SET(PROJECT_DESCRIPTION "Graphical interface for HPP ") - -SETUP_HPP_PROJECT() +COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX) +PROJECT(${PROJECT_NAME} ${PROJECT_ARGS}) FINDPYTHON() ADD_REQUIRED_DEPENDENCY("gepetto-viewer-corba >= 1.3") @@ -106,5 +106,3 @@ ELSE () INSTALL (FILES etc/gepetto-gui/basic.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/gepetto-gui) ENDIF () - -SETUP_HPP_PROJECT_FINALIZE() diff --git a/cmake b/cmake index 429af97..7eca9ee 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 429af97fe0b858bd73a1747768cc1ac735386140 +Subproject commit 7eca9ee6c9d1c4ee20eb82272e94f9d11642053a