diff --git a/.gitignore b/.gitignore index 5fad5f2..1d7c863 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /glm-0.9.9.2.zip /glm-0.9.9.6.zip /0.9.9.8.tar.gz +/1.0.1.tar.gz diff --git a/glm-0.9.6.1-ulp.patch b/glm-0.9.6.1-ulp.patch deleted file mode 100644 index c5ccb95..0000000 --- a/glm-0.9.6.1-ulp.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru glm/glm/gtc/ulp.inl glm-ulp/glm/gtc/ulp.inl ---- glm/glm/gtc/ulp.inl 2014-12-09 21:13:54.000000000 +0200 -+++ glm-ulp/glm/gtc/ulp.inl 2015-01-06 16:29:47.497932633 +0200 -@@ -316,7 +316,7 @@ - if(x < y) - { - T temp = x; -- while(temp != y)// && ulp < std::numeric_limits::max()) -+ while(temp < y)// && ulp < std::numeric_limits::max()) - { - ++ulp; - temp = next_float(temp); -@@ -325,7 +325,7 @@ - else if(y < x) - { - T temp = y; -- while(temp != x)// && ulp < std::numeric_limits::max()) -+ while(temp < x)// && ulp < std::numeric_limits::max()) - { - ++ulp; - temp = next_float(temp); diff --git a/glm-0.9.8.5-compiler-list.patch b/glm-0.9.8.5-compiler-list.patch deleted file mode 100644 index 47d7ee2..0000000 --- a/glm-0.9.8.5-compiler-list.patch +++ /dev/null @@ -1,345 +0,0 @@ -diff -ru glm/glm/simd/platform.h glm.compiler-list/glm/simd/platform.h ---- glm/glm/simd/platform.h 2018-02-04 06:40:56.358999859 +0200 -+++ glm.compiler-list/glm/simd/platform.h 2018-02-04 06:46:34.359917919 +0200 -@@ -77,58 +77,37 @@ - - // Intel - #define GLM_COMPILER_INTEL 0x00100000 --#define GLM_COMPILER_INTEL12 0x00100010 --#define GLM_COMPILER_INTEL12_1 0x00100020 --#define GLM_COMPILER_INTEL13 0x00100030 - #define GLM_COMPILER_INTEL14 0x00100040 - #define GLM_COMPILER_INTEL15 0x00100050 - #define GLM_COMPILER_INTEL16 0x00100060 -+#define GLM_COMPILER_INTEL17 0x00100070 - - // Visual C++ defines - #define GLM_COMPILER_VC 0x01000000 --#define GLM_COMPILER_VC10 0x01000090 --#define GLM_COMPILER_VC11 0x010000A0 - #define GLM_COMPILER_VC12 0x010000B0 - #define GLM_COMPILER_VC14 0x010000C0 - #define GLM_COMPILER_VC15 0x010000D0 -+#define GLM_COMPILER_VC16 0x010000E0 - - // GCC defines - #define GLM_COMPILER_GCC 0x02000000 --#define GLM_COMPILER_GCC44 0x020000B0 --#define GLM_COMPILER_GCC45 0x020000C0 - #define GLM_COMPILER_GCC46 0x020000D0 - #define GLM_COMPILER_GCC47 0x020000E0 - #define GLM_COMPILER_GCC48 0x020000F0 - #define GLM_COMPILER_GCC49 0x02000100 --#define GLM_COMPILER_GCC50 0x02000200 --#define GLM_COMPILER_GCC51 0x02000300 --#define GLM_COMPILER_GCC52 0x02000400 --#define GLM_COMPILER_GCC53 0x02000500 --#define GLM_COMPILER_GCC54 0x02000600 --#define GLM_COMPILER_GCC60 0x02000700 --#define GLM_COMPILER_GCC61 0x02000800 --#define GLM_COMPILER_GCC62 0x02000900 --#define GLM_COMPILER_GCC70 0x02000A00 --#define GLM_COMPILER_GCC71 0x02000B00 --#define GLM_COMPILER_GCC72 0x02000C00 --#define GLM_COMPILER_GCC80 0x02000D00 -+#define GLM_COMPILER_GCC5 0x02000200 -+#define GLM_COMPILER_GCC6 0x02000300 -+#define GLM_COMPILER_GCC7 0x02000400 -+#define GLM_COMPILER_GCC8 0x02000500 - - // CUDA - #define GLM_COMPILER_CUDA 0x10000000 --#define GLM_COMPILER_CUDA40 0x10000040 --#define GLM_COMPILER_CUDA41 0x10000050 --#define GLM_COMPILER_CUDA42 0x10000060 --#define GLM_COMPILER_CUDA50 0x10000070 --#define GLM_COMPILER_CUDA60 0x10000080 --#define GLM_COMPILER_CUDA65 0x10000090 - #define GLM_COMPILER_CUDA70 0x100000A0 - #define GLM_COMPILER_CUDA75 0x100000B0 - #define GLM_COMPILER_CUDA80 0x100000C0 - - // Clang - #define GLM_COMPILER_CLANG 0x20000000 --#define GLM_COMPILER_CLANG32 0x20000030 --#define GLM_COMPILER_CLANG33 0x20000040 - #define GLM_COMPILER_CLANG34 0x20000050 - #define GLM_COMPILER_CLANG35 0x20000060 - #define GLM_COMPILER_CLANG36 0x20000070 -@@ -148,20 +127,16 @@ - # define GLM_COMPILER GLM_COMPILER_UNKNOWN - - #elif defined(__INTEL_COMPILER) --# if __INTEL_COMPILER == 1200 --# define GLM_COMPILER GLM_COMPILER_INTEL12 --# elif __INTEL_COMPILER == 1210 --# define GLM_COMPILER GLM_COMPILER_INTEL12_1 --# elif __INTEL_COMPILER == 1300 --# define GLM_COMPILER GLM_COMPILER_INTEL13 -+# if (__clang_major__ < 1400) -+# error "GLM requires ICC 2013 SP1 or newer" - # elif __INTEL_COMPILER == 1400 - # define GLM_COMPILER GLM_COMPILER_INTEL14 - # elif __INTEL_COMPILER == 1500 - # define GLM_COMPILER GLM_COMPILER_INTEL15 --# elif __INTEL_COMPILER >= 1600 -+# elif __INTEL_COMPILER == 1600 - # define GLM_COMPILER GLM_COMPILER_INTEL16 --# else --# define GLM_COMPILER GLM_COMPILER_INTEL -+# elif __INTEL_COMPILER >= 1700 -+# define GLM_COMPILER GLM_COMPILER_INTEL17 - # endif - - // CUDA -@@ -178,28 +153,18 @@ - // Clang - #elif defined(__clang__) - # if defined(__apple_build_version__) --# if __clang_major__ == 5 && __clang_minor__ == 0 --# define GLM_COMPILER GLM_COMPILER_CLANG33 --# elif __clang_major__ == 5 && __clang_minor__ == 1 --# define GLM_COMPILER GLM_COMPILER_CLANG34 -+# if (__clang_major__ < 6) -+# error "GLM requires Clang 3.4 / Apple Clang 6.0 or higher" - # elif __clang_major__ == 6 && __clang_minor__ == 0 - # define GLM_COMPILER GLM_COMPILER_CLANG35 - # elif __clang_major__ == 6 && __clang_minor__ >= 1 - # define GLM_COMPILER GLM_COMPILER_CLANG36 - # elif __clang_major__ >= 7 - # define GLM_COMPILER GLM_COMPILER_CLANG37 --# else --# define GLM_COMPILER GLM_COMPILER_CLANG - # endif - # else --# if __clang_major__ == 3 && __clang_minor__ == 0 --# define GLM_COMPILER GLM_COMPILER_CLANG30 --# elif __clang_major__ == 3 && __clang_minor__ == 1 --# define GLM_COMPILER GLM_COMPILER_CLANG31 --# elif __clang_major__ == 3 && __clang_minor__ == 2 --# define GLM_COMPILER GLM_COMPILER_CLANG32 --# elif __clang_major__ == 3 && __clang_minor__ == 3 --# define GLM_COMPILER GLM_COMPILER_CLANG33 -+# if ((__clang_major__ == 3) && (__clang_minor__ < 4)) || (__clang_major__ < 3) -+# error "GLM requires Clang 3.4 or higher" - # elif __clang_major__ == 3 && __clang_minor__ == 4 - # define GLM_COMPILER GLM_COMPILER_CLANG34 - # elif __clang_major__ == 3 && __clang_minor__ == 5 -@@ -220,39 +185,25 @@ - # define GLM_COMPILER GLM_COMPILER_CLANG42 - # elif __clang_major__ >= 4 - # define GLM_COMPILER GLM_COMPILER_CLANG42 --# else --# define GLM_COMPILER GLM_COMPILER_CLANG - # endif - # endif - - // Visual C++ - #elif defined(_MSC_VER) --# if _MSC_VER < 1600 --# error "GLM requires Visual C++ 10 - 2010 or higher" --# elif _MSC_VER == 1600 --# define GLM_COMPILER GLM_COMPILER_VC11 --# elif _MSC_VER == 1700 --# define GLM_COMPILER GLM_COMPILER_VC11 -+# if _MSC_VER < 1800 -+# error "GLM requires Visual C++ 12 - 2013 or higher" - # elif _MSC_VER == 1800 - # define GLM_COMPILER GLM_COMPILER_VC12 - # elif _MSC_VER == 1900 - # define GLM_COMPILER GLM_COMPILER_VC14 - # elif _MSC_VER >= 1910 - # define GLM_COMPILER GLM_COMPILER_VC15 --# else//_MSC_VER --# define GLM_COMPILER GLM_COMPILER_VC - # endif//_MSC_VER - - // G++ - #elif defined(__GNUC__) || defined(__MINGW32__) --# if (__GNUC__ == 4) && (__GNUC_MINOR__ == 2) --# define GLM_COMPILER (GLM_COMPILER_GCC42) --# elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 3) --# define GLM_COMPILER (GLM_COMPILER_GCC43) --# elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 4) --# define GLM_COMPILER (GLM_COMPILER_GCC44) --# elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 5) --# define GLM_COMPILER (GLM_COMPILER_GCC45) -+# if ((__GNUC__ == 4) && (__GNUC_MINOR__ < 6)) || (__GNUC__ < 4) -+# error "GLM requires GCC 4.7 or higher" - # elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 6) - # define GLM_COMPILER (GLM_COMPILER_GCC46) - # elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 7) -@@ -261,32 +212,14 @@ - # define GLM_COMPILER (GLM_COMPILER_GCC48) - # elif (__GNUC__ == 4) && (__GNUC_MINOR__ >= 9) - # define GLM_COMPILER (GLM_COMPILER_GCC49) --# elif (__GNUC__ == 5) && (__GNUC_MINOR__ == 0) --# define GLM_COMPILER (GLM_COMPILER_GCC50) --# elif (__GNUC__ == 5) && (__GNUC_MINOR__ == 1) --# define GLM_COMPILER (GLM_COMPILER_GCC51) --# elif (__GNUC__ == 5) && (__GNUC_MINOR__ == 2) --# define GLM_COMPILER (GLM_COMPILER_GCC52) --# elif (__GNUC__ == 5) && (__GNUC_MINOR__ == 3) --# define GLM_COMPILER (GLM_COMPILER_GCC53) --# elif (__GNUC__ == 5) && (__GNUC_MINOR__ >= 4) --# define GLM_COMPILER (GLM_COMPILER_GCC54) --# elif (__GNUC__ == 6) && (__GNUC_MINOR__ == 0) --# define GLM_COMPILER (GLM_COMPILER_GCC60) --# elif (__GNUC__ == 6) && (__GNUC_MINOR__ == 1) --# define GLM_COMPILER (GLM_COMPILER_GCC61) --# elif (__GNUC__ == 6) && (__GNUC_MINOR__ >= 2) --# define GLM_COMPILER (GLM_COMPILER_GCC62) --# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 0) --# define GLM_COMPILER (GLM_COMPILER_GCC70) --# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 1) --# define GLM_COMPILER (GLM_COMPILER_GCC71) --# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 2) --# define GLM_COMPILER (GLM_COMPILER_GCC72) -+# elif (__GNUC__ == 5) -+# define GLM_COMPILER (GLM_COMPILER_GCC5) -+# elif (__GNUC__ == 6) -+# define GLM_COMPILER (GLM_COMPILER_GCC6) -+# elif (__GNUC__ == 7) -+# define GLM_COMPILER (GLM_COMPILER_GCC7) - # elif (__GNUC__ >= 8) --# define GLM_COMPILER (GLM_COMPILER_GCC80) --# else --# define GLM_COMPILER (GLM_COMPILER_GCC) -+# define GLM_COMPILER (GLM_COMPILER_GCC8) - # endif - - #else -diff -ru glm/test/core/core_setup_message.cpp glm.compiler-list/test/core/core_setup_message.cpp ---- glm/test/core/core_setup_message.cpp 2018-02-04 06:40:56.359999845 +0200 -+++ glm.compiler-list/test/core/core_setup_message.cpp 2018-02-04 06:41:19.846652644 +0200 -@@ -10,12 +10,6 @@ - { - switch(GLM_COMPILER) - { -- case GLM_COMPILER_VC10: -- std::printf("Visual C++ 10 - 2010\n"); -- break; -- case GLM_COMPILER_VC11: -- std::printf("Visual C++ 11 - 2012\n"); -- break; - case GLM_COMPILER_VC12: - std::printf("Visual C++ 12 - 2013\n"); - break; -@@ -23,7 +17,10 @@ - std::printf("Visual C++ 14 - 2015\n"); - break; - case GLM_COMPILER_VC15: -- std::printf("Visual C++ 15 - 201X\n"); -+ std::printf("Visual C++ 15 - 2017\n"); -+ break; -+ case GLM_COMPILER_VC16: -+ std::printf("Visual C++ 16 - 20XX\n"); - break; - default: - std::printf("Visual C++ version not detected\n"); -@@ -35,12 +32,6 @@ - { - switch(GLM_COMPILER) - { -- case GLM_COMPILER_GCC44: -- std::printf("GCC 4.4\n"); -- break; -- case GLM_COMPILER_GCC45: -- std::printf("GCC 4.5\n"); -- break; - case GLM_COMPILER_GCC46: - std::printf("GCC 4.6\n"); - break; -@@ -53,41 +44,17 @@ - case GLM_COMPILER_GCC49: - std::printf("GCC 4.9\n"); - break; -- case GLM_COMPILER_GCC50: -- std::printf("GCC 5.0\n"); -- break; -- case GLM_COMPILER_GCC51: -- std::printf("GCC 5.1\n"); -- break; -- case GLM_COMPILER_GCC52: -- std::printf("GCC 5.2\n"); -- break; -- case GLM_COMPILER_GCC53: -- std::printf("GCC 5.3\n"); -- break; -- case GLM_COMPILER_GCC54: -- std::printf("GCC 5.4\n"); -- break; -- case GLM_COMPILER_GCC60: -- std::printf("GCC 6.0\n"); -+ case GLM_COMPILER_GCC5: -+ std::printf("GCC 5\n"); - break; -- case GLM_COMPILER_GCC61: -- std::printf("GCC 6.1\n"); -+ case GLM_COMPILER_GCC6: -+ std::printf("GCC 6\n"); - break; -- case GLM_COMPILER_GCC62: -- std::printf("GCC 6.2\n"); -+ case GLM_COMPILER_GCC7: -+ std::printf("GCC 7\n"); - break; -- case GLM_COMPILER_GCC70: -- std::printf("GCC 7.0\n"); -- break; -- case GLM_COMPILER_GCC71: -- std::printf("GCC 7.1\n"); -- break; -- case GLM_COMPILER_GCC72: -- std::printf("GCC 7.2\n"); -- break; -- case GLM_COMPILER_GCC80: -- std::printf("GCC 8.0\n"); -+ case GLM_COMPILER_GCC8: -+ std::printf("GCC 8\n"); - break; - default: - std::printf("GCC version not detected\n"); -@@ -103,12 +70,6 @@ - { - switch(GLM_COMPILER) - { -- case GLM_COMPILER_CLANG32: -- std::printf("Clang 3.2\n"); -- break; -- case GLM_COMPILER_CLANG33: -- std::printf("Clang 3.3\n"); -- break; - case GLM_COMPILER_CLANG34: - std::printf("Clang 3.4\n"); - break; -@@ -145,23 +106,17 @@ - { - switch(GLM_COMPILER) - { -- case GLM_COMPILER_INTEL12: -- std::printf("ICC 12\n"); -- break; -- case GLM_COMPILER_INTEL12_1: -- std::printf("ICC 12.1\n"); -- break; -- case GLM_COMPILER_INTEL13: -- std::printf("ICC 13\n"); -- break; - case GLM_COMPILER_INTEL14: -- std::printf("ICC 14\n"); -+ std::printf("ICC 14 - 2013 SP1\n"); - break; - case GLM_COMPILER_INTEL15: -- std::printf("ICC 15\n"); -+ std::printf("ICC 15 - 2015\n"); - break; - case GLM_COMPILER_INTEL16: -- std::printf("ICC 16\n"); -+ std::printf("ICC 16 - 2017\n"); -+ break; -+ case GLM_COMPILER_INTEL17: -+ std::printf("ICC 17 - 20XX\n"); - break; - default: - std::printf("Intel compiler version not detected\n"); diff --git a/glm-0.9.9.8-install.patch b/glm-0.9.9.8-install.patch deleted file mode 100644 index ce30e95..0000000 --- a/glm-0.9.9.8-install.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 02f26a88537b0b02dd0df77fc858e9449c7e3847 Mon Sep 17 00:00:00 2001 -From: Krzysztof Kurek -Date: Sat, 30 Jan 2021 21:08:48 +0100 -Subject: [PATCH] Add installation support from PR #1054 - -This is based on commit 887827b762111a8e6b4765513b4be212fa6a5426, -discovered from https://github.com/g-truc/glm/pull/1054 ---- - CMakeLists.txt | 16 ++++++++++++++-- - cmake/glm/glmConfig-version.cmake | 11 ----------- - cmake/glm/glmConfig.cmake | 22 ---------------------- - glm/CMakeLists.txt | 10 +++++++++- - manual.md | 21 ++++++++++++++++++++- - 5 files changed, 43 insertions(+), 37 deletions(-) - delete mode 100644 cmake/glm/glmConfig-version.cmake - delete mode 100644 cmake/glm/glmConfig.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 843e7546..642a5fde 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,13 +3,25 @@ cmake_policy(VERSION 3.2) - - set(GLM_VERSION "0.9.9") - project(glm VERSION ${GLM_VERSION} LANGUAGES CXX) --enable_testing() -+message(STATUS "GLM: Version " ${GLM_VERSION}) - - add_subdirectory(glm) - add_library(glm::glm ALIAS glm) - - if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - --add_subdirectory(test) -+ include(CPack) -+ install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PATTERN "CMakeLists.txt" EXCLUDE) -+ install(EXPORT glm FILE glmConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glm NAMESPACE glm::) -+ include(CMakePackageConfigHelpers) -+ write_basic_package_version_file("glmConfigVersion.cmake" COMPATIBILITY AnyNewerVersion) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glm) -+ -+ include(CTest) -+ if(BUILD_TESTING) -+ add_subdirectory(test) -+ endif() - - endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) -+ -+ -diff --git a/cmake/glm/glmConfig-version.cmake b/cmake/glm/glmConfig-version.cmake -deleted file mode 100644 -index 6e63a4a3..00000000 ---- a/cmake/glm/glmConfig-version.cmake -+++ /dev/null -@@ -1,11 +0,0 @@ --if(${PACKAGE_FIND_VERSION_MAJOR} EQUAL 0) -- if (${PACKAGE_FIND_VERSION} VERSION_LESS ${GLM_VERSION}) -- set(PACKAGE_VERSION_COMPATIBLE 1) -- endif() -- if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${GLM_VERSION}) -- set(PACKAGE_VERSION_EXACT 1) -- endif() --else() -- set(PACKAGE_VERSION_UNSUITABLE 1) --endif() -- -diff --git a/cmake/glm/glmConfig.cmake b/cmake/glm/glmConfig.cmake -deleted file mode 100644 -index 4fba5116..00000000 ---- a/cmake/glm/glmConfig.cmake -+++ /dev/null -@@ -1,22 +0,0 @@ --cmake_minimum_required(VERSION 3.2 FATAL_ERROR) --cmake_policy(VERSION 3.2) -- --set(GLM_VERSION 0.9.9) -- --get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) --get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) --get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) --if (_IMPORT_PREFIX STREQUAL "/") -- set(_IMPORT_PREFIX "") --endif() -- --# Set the old GLM_INCLUDE_DIRS variable for backwards compatibility --set(GLM_INCLUDE_DIRS ${_IMPORT_PREFIX}) -- --add_library(glm::glm INTERFACE IMPORTED) --set_target_properties(glm::glm PROPERTIES -- INTERFACE_INCLUDE_DIRECTORIES ${GLM_INCLUDE_DIRS}) -- --mark_as_advanced(glm_DIR) --set(_IMPORT_PREFIX) -- -diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt -index 4ff51c81..cee0d2e7 100644 ---- a/glm/CMakeLists.txt -+++ b/glm/CMakeLists.txt -@@ -43,7 +43,15 @@ source_group("SIMD Files" FILES ${SIMD_INLINE}) - source_group("SIMD Files" FILES ${SIMD_HEADER}) - - add_library(glm INTERFACE) --target_include_directories(glm INTERFACE ../) -+ -+include(GNUInstallDirs) -+ -+target_include_directories(glm INTERFACE -+ $ -+ $ -+) -+ -+install(TARGETS glm EXPORT glm) - - if(BUILD_STATIC_LIBS) - add_library(glm_static STATIC ${ROOT_TEXT} ${ROOT_MD} ${ROOT_NAT} -diff --git a/manual.md b/manual.md -index a7f6956f..d53df3d7 100644 ---- a/manual.md -+++ b/manual.md -@@ -277,7 +277,26 @@ GLM does not depend on external libraries or headers such as ``, [` 1.5. Finding GLM with CMake - --GLM packages a `glmConfig.cmake` and `glmConfig-version.cmake` in the root of the repository and the release archives. To find GLM with CMake you can pass `-Dglm_DIR=/cmake/glm/` when running CMake. You can then either add `${GLM_INCLUDE_DIRS}` to your target's include directories, or link against the imported `glm::glm` target. -+When installed, GLM provides the CMake package configuration files `glmConfig.cmake` and `glmConfigVersion.cmake`. -+ -+To use these configurations files, you may need to set the `glm_DIR` variable to the directory containing the configuration files `/lib/cmake/glm/`. -+ -+Use the `find_package` CMake command to load the configurations into your project. Lastly, either link your executable against the `glm::glm` target or add `${GLM_INCLUDE_DIRS}` to your target's include directories: -+ -+```cmake -+set(glm_DIR /lib/cmake/glm) # if necessary -+find_package(glm REQUIRED) -+target_link_libraries( glm::glm) -+``` -+ -+To use GLM as a submodule in a project instead, use `add_subdirectory` to expose the same target, or add the directory to your target's -+ -+```cmake -+add_subdirectory(glm) -+target_link_libraries( glm::glm) -+# or -+target_include_directories( glm) -+``` - - --- -
--- -2.29.2 - diff --git a/glm-0.9.9.8-noarch.patch b/glm-0.9.9.8-noarch.patch deleted file mode 100644 index fb6fc21..0000000 --- a/glm-0.9.9.8-noarch.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e0c728eca35d6d9c34d239c56bdcfb460b378676 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= -Date: Sun, 7 Feb 2021 19:34:40 +0200 -Subject: [PATCH] Use built-in mechanism for marking arch-independent - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 642a5fde..a7b80449 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -14,7 +14,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} PATTERN "CMakeLists.txt" EXCLUDE) - install(EXPORT glm FILE glmConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glm NAMESPACE glm::) - include(CMakePackageConfigHelpers) -- write_basic_package_version_file("glmConfigVersion.cmake" COMPATIBILITY AnyNewerVersion) -+ write_basic_package_version_file("glmConfigVersion.cmake" COMPATIBILITY AnyNewerVersion ARCH_INDEPENDENT) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glm) - - include(CTest) --- -2.29.2 - diff --git a/glm-1.0.1-noarch.patch b/glm-1.0.1-noarch.patch new file mode 100644 index 0000000..aa1b06c --- /dev/null +++ b/glm-1.0.1-noarch.patch @@ -0,0 +1,11 @@ +diff -ru glm-1.0.1/CMakeLists.txt glm-1.0.1-noarch/CMakeLists.txt +--- glm-1.0.1/CMakeLists.txt 2024-02-27 18:19:47.000000000 +0100 ++++ glm-1.0.1-noarch/CMakeLists.txt 2024-03-02 11:25:31.703221759 +0100 +@@ -270,6 +270,7 @@ + write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" + COMPATIBILITY AnyNewerVersion ++ ARCH_INDEPENDENT + ) + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" diff --git a/glm-1.0.1-without-werror.patch b/glm-1.0.1-without-werror.patch new file mode 100644 index 0000000..75da60b --- /dev/null +++ b/glm-1.0.1-without-werror.patch @@ -0,0 +1,12 @@ +diff -ru glm-1.0.1/test/CMakeLists.txt glm-1.0.1-without-werror/test/CMakeLists.txt +--- glm-1.0.1/test/CMakeLists.txt 2024-02-27 18:19:47.000000000 +0100 ++++ glm-1.0.1-without-werror/test/CMakeLists.txt 2024-03-02 11:57:28.431725545 +0100 +@@ -20,7 +20,7 @@ + endif() + + if(NOT GLM_DISABLE_AUTO_DETECTION) +- add_compile_options(-Werror) ++# add_compile_options(-Werror) + # add_compile_options(-Wpedantic) + # add_compile_options(-Wall) + # add_compile_options(-Wextra) diff --git a/glm.spec b/glm.spec index b81531a..60251db 100644 --- a/glm.spec +++ b/glm.spec @@ -2,15 +2,15 @@ %global debug_package %{nil} Name: glm -Version: 0.9.9.8 -Release: 9%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: C++ mathematics library for graphics programming License: MIT URL: http://glm.g-truc.net/ Source0: https://github.com/g-truc/glm/archive/%{version}.tar.gz -Patch0: glm-0.9.9.8-install.patch -Patch1: glm-0.9.9.8-noarch.patch +Patch0: glm-1.0.1-noarch.patch +Patch1: glm-1.0.1-without-werror.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -83,34 +83,27 @@ sed -i 's/\r//' glm/detail/setup.hpp sed -i 's/\r//' glm/simd/platform.h sed -i 's/\r//' test/core/core_setup_message.cpp -%patch0 -p1 -%patch1 -p1 +%patch 0 -p1 +%patch 1 -p1 %build + export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%{cmake} -DGLM_TEST_ENABLE=ON +%{cmake} -DGLM_TEST_ENABLE=ON -DGLM_BUILD_LIBRARY=OFF -DCMAKE_INSTALL_DATAROOTDIR=%{_datadir}/cmake %cmake_build %check export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" # Some tests are disabled due to failing tests (to be reported) -# - test-core_func_common fails on aarch64 # - test-gtc_packing fails on s390x -%ctest -- --output-on-failure -E '(test-core_func_common|test-gtc_packing)' +%ctest -- --output-on-failure -E 'test-gtc_packing' %install %cmake_install find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name CMakeLists.txt -exec rm -f {} ';' -# The cmake config files seem architecture independent and since -# also glm-devel is otherwise noarch, it is desired to ship the -# cmake configuration files under /usr/share. -mkdir -pv $RPM_BUILD_ROOT%{_datadir} -mv $RPM_BUILD_ROOT%{_libdir}/cmake $RPM_BUILD_ROOT%{_datadir}/cmake -rmdir $RPM_BUILD_ROOT%{_libdir} - # The library can get installed into the include directory - seen on EPEL8 rm -rf $RPM_BUILD_ROOT%{_includedir}/%{name}/{CMakeFiles,libglm_shared.so} @@ -120,13 +113,16 @@ rm -rf $RPM_BUILD_ROOT%{_includedir}/%{name}/{CMakeFiles,libglm_shared.so} %files devel %doc readme.md %{_includedir}/%{name} -%{_datadir}/cmake +%{_datadir}/cmake/%{name} %files doc %doc doc/manual.pdf %doc doc/api/ %changelog +* Sat Mar 02 2024 Joonas Sarajärvi - 1.0.1-1 +- Update to upstream GLM version 1.0.1 + * Wed Jan 24 2024 Fedora Release Engineering - 0.9.9.8-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index b13398d..f042861 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (0.9.9.8.tar.gz) = 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8 +SHA512 (1.0.1.tar.gz) = c6c6fa1ea7a7e97820e36ee042a78be248ae828c99c1b1111080d9bf334a5160c9993a70312351c92a867cd49907c95f9f357c8dfe2bc29946da6e83e27ba20c