From 15748c30eaac7250b564f28b685425818f65ebf2 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 30 May 2016 12:50:00 +0200 Subject: [PATCH 1/2] Added pkg-config file --- CMakeLists.txt | 13 +++++++++++++ glm.pc.in | 7 +++++++ 2 files changed, 20 insertions(+) create mode 100644 glm.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index d89a25d9..0d32727c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -200,4 +200,17 @@ if (NOT CMAKE_VERSION VERSION_LESS "3.0") ) endif() +# build pkg-config file +configure_file( + "glm.pc.in" + "glm.pc" + @ONLY +) + +# install pkg-config file +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/glm.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" +) + export(PACKAGE glm) diff --git a/glm.pc.in b/glm.pc.in new file mode 100644 index 00000000..fc5c7bb7 --- /dev/null +++ b/glm.pc.in @@ -0,0 +1,7 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +includedir=${prefix}/include + +Name: GLM +Description: OpenGL Mathematics +Version: @GLM_VERSION@ +Cflags: -I${includedir} From 64342f78bf1b5a9d6826f96fe4ba482677d96e3c Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 30 May 2016 20:28:42 +0200 Subject: [PATCH 2/2] Updated version and updated readme --- glm/detail/setup.hpp | 4 ++-- readme.md | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 9c7f209e..b742bd62 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -42,11 +42,11 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 7 -#define GLM_VERSION_REVISION 5 +#define GLM_VERSION_REVISION 6 #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_VERSION_DISPLAYED)) # define GLM_MESSAGE_VERSION_DISPLAYED -# pragma message ("GLM: version 0.9.7.5") +# pragma message ("GLM: version 0.9.7.6") #endif//GLM_MESSAGE /////////////////////////////////////////////////////////////////////////////////// diff --git a/readme.md b/readme.md index 6a462ac6..6d8f2b2c 100644 --- a/readme.md +++ b/readme.md @@ -51,6 +51,10 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ## Release notes +#### [GLM 0.9.7.6](https://github.com/g-truc/glm/tree/0.9.7) - 2016-0X-XX +##### Improvements: +- Added pkg-config file #509 + #### [GLM 0.9.7.5](https://github.com/g-truc/glm/releases/tag/0.9.7.5) - 2016-05-24 ##### Improvements: - Added Visual C++ Clang toolset detection