Merge pull request #8 from hedgepigdaniel/fix-meson

arntanguy · Mar 15, 2021 · 3919a25 · 3919a25
2 parents a3a7dab + 7147138
commit 3919a25
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,7 +30,7 @@ if(MSVC)
 endif()
 
 
-add_project_dependency(Eigen3 REQUIRED)
+add_project_dependency(Eigen3 REQUIRED PKG_CONFIG_REQUIRES eigen3)
 add_project_dependency(Boost REQUIRED)
 add_subdirectory(src)
 

diff --git a/cmake b/cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -26,6 +26,8 @@ else()
   target_link_libraries(gram_savitzky_golay PUBLIC ${BOOST_LIBRARIES})
 endif()
 
+pkg_config_append_libs(gram_savitzky_golay)
+
 set_target_properties(gram_savitzky_golay PROPERTIES SOVERSION ${PROJECT_VERSION})
 
 install(TARGETS gram_savitzky_golay
+1 −1		.docs/examples/minimal-with-packages.cmake
+14 −0		.docs/pages/base.rst
+3 −7		.docs/pages/cmake-packages.rst
+33 −2		.docs/pages/developers.rst
+5 −0		.docs/pages/internal.rst
+11 −1		.github/workflows/cmake.yml
+1 −0		.gitignore
+127 −3		Config.cmake.in
+244 −115		GNUInstallDirs.cmake
+30 −0		_unittests/cpp/CMakeLists.txt
+1 −0		_unittests/cpp/include/jrl_cmakemodule/lib.hh
+7 −0		_unittests/cpp/src/lib.cc
+8 −0		_unittests/cpp/src/main.cc
+20 −0		_unittests/dependency/CMakeLists.txt
+11 −0		_unittests/macros.cmake
+21 −0		_unittests/python/CMakeLists.txt
+0 −0		_unittests/python/jrl_cmakemodule/python.py
+46 −0		_unittests/run_unit_tests.sh
+45 −1		base.cmake
+118 −86		boost.cmake
+2,099 −0		boost/FindBoost.cmake
+2 −2		compiler.cmake
+23 −0		componentConfig.cmake.in
+79 −0		cxx-standard.cmake
+6 −0		cxx-standard.cpp
+3 −1		cython/cython.cmake
+2 −1		cython/setup.in.py
+3 −3		dist.cmake
+2 −1		distcheck.cmake
+502 −63		doxygen.cmake
+0 −4		doxygen/Doxyfile.extra.in
+0 −1,524		doxygen/Doxyfile.in
+10 −0		doxygen/doxyfile.awk
+0 −70		dynamic_graph/python-module-py.cc
+32 −0		dynamic_graph/python-module-py.cc.in
+3 −19		dynamic_graph/submodule/__init__.py.cmake
+3 −1		eigen.cmake
+36 −0		find-external/CppAD/Findcppad.cmake
+29 −0		find-external/CppAD/Findcppadcg.cmake
+2 −2		find-external/qpOASES/FindqpOASES.cmake
+7 −7		header.cmake
+2 −2		hpp.cmake
+5 −2		hpp/doc.cmake
+7 −3		hpp/idl/omniidl_be_python_with_docstring.py
+1 −1		idl.cmake
+115 −28		msvc-specific.cmake
+4 −1		msvc.vcxproj.user.in
+1 −1		openhrpcontroller.cmake
+1 −1		openrtm.cmake
+109 −18		package-config.cmake
+50 −16		pkg-config.cmake
+1 −1		pkg-config.pc.cmake
+1 −0		post-project.cmake
+251 −154		python.cmake
+68 −77		python/FindPythonInterp.cmake
+192 −103		python/FindPythonLibs.cmake
+1 −1		sphinx.cmake
+14 −8		test.cmake
+2 −2		uninstall.cmake
+29 −18		version-script.cmake
+143 −106		version.cmake