[CMake] sync submodule

Gepetto · Nov 27, 2019 · 4a028bd · 4a028bd
1 parent 5a78aa7
commit 4a028bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,15 +17,18 @@
 #
 ######################
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+SET(PROJECT_NAME qgv)
+SET(PROJECT_DESCRIPTION "Interactive Qt graphViz display")
+SET(PROJECT_URL "https://github.com/nbergont/qgv")
 
 SET(CXX_DISABLE_WERROR TRUE)
 INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/boost.cmake)
 
-SET(PROJECT_NAME qgv)
-SET(PROJECT_DESCRIPTION "Interactive Qt graphViz display")
-SET(PROJECT_URL "https://github.com/nbergont/qgv")
+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
+PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
 
 # Extending the Module path with the local module path of desuto
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules/modules )
@@ -100,14 +103,10 @@ SET(${PROJECT_NAME}_HEADERS
   QGVCore/QGVSubGraph.h
 )
 
-SETUP_PROJECT ()
-
 ADD_SUBDIRECTORY(QGVCore)
 ADD_SUBDIRECTORY(Sample EXCLUDE_FROM_ALL)
 ADD_SUBDIRECTORY(doc)
 
 # Hack for pkg-config
 SET (_PKG_CONFIG_INCLUDEDIR "${_PKG_CONFIG_INCLUDEDIR}/QGVCore")
 PKG_CONFIG_APPEND_LIBS("qgvcore")
-
-SETUP_PROJECT_FINALIZE ()
diff --git a/cmake b/cmake
+14 −0		.docs/examples/minimal-hpp.cmake
+25 −0		.docs/examples/minimal-with-packages.cmake
+8 −11		.docs/examples/minimal.cmake
+1 −0		.docs/index.rst
+37 −0		.docs/pages/cmake-packages.rst
+5 −0		.docs/pages/other.rst
+3 −3		.docs/pages/projects.rst
+27 −0		.github/workflows/cmake.yml
+1 −0		.gitignore
+16 −0		Config.cmake.in
+2 −2		README.md
+1 −0		_unittests/cmake
+42 −0		_unittests/test_pkg-config.cmake
+153 −170		base.cmake
+94 −54		boost.cmake
+19 −1		cmake_uninstall.cmake.in
+16 −26		config.hh.cmake
+359 −0		cython/cython.cmake
+0 −0		cython/dummy.cpp
+224 −0		cython/python/FindPython.cmake
+1,324 −0		cython/python/FindPython/Support.cmake
+189 −0		cython/python/FindPython2.cmake
+189 −0		cython/python/FindPython3.cmake
+6 −0		cython/python/README.md
+102 −0		cython/setup.in.py
+5 −24		deprecated.hh.cmake
+3 −1		distcheck.cmake
+25 −6		doxygen.cmake
+16 −6		doxygen/header.html
+39 −2		dynamic_graph/python-module-py.cc
+7 −3		dynamic_graph/submodule/__init__.py.cmake
+43 −0		find-external/CDD/FindCDD.cmake
+42 −0		find-external/CLP/FindCLP.cmake
+0 −0		find-external/OpenRTM/FindOpenRTM.cmake
+43 −0		find-external/TinyXML/FindTinyXML.cmake
+43 −0		find-external/glpk/Findglpk.cmake
+42 −0		find-external/qpOASES/FindqpOASES.cmake
+5 −3		github/update-doxygen-doc.sh
+46 −17		header.cmake
+51 −45		hpp.cmake
+2 −4		hpp/doc.cmake
+127 −0		hpp/idl/omniidl_be_python_with_docstring.py
+7 −1		ide.cmake
+54 −12		idl.cmake
+3 −0		msvc-specific.cmake
+1 −1		msvc.vcxproj.user.in
+1 −1		openrtm.cmake
+56 −0		oscheck.cmake
+27 −2		package-config.cmake
+118 −53		pkg-config.cmake
+59 −0		post-project.cmake
+107 −17		python.cmake
+3 −1		release.cmake
+4 −7		shared-library.cmake
+58 −54		sphinx.cmake
+67 −25		test.cmake
+83 −29		version.cmake
+4 −23		warning.hh.cmake