From d1e01692390dae45b6e6ad13fa7fc452c53e14bc Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 1 Jul 2022 00:25:31 +0000 Subject: [PATCH 01/12] updated v0.9.9.8 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ecea4c8..1aac2a2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "GLM" %} -{% set version = "0.9.9.4" %} +{% set version = "0.9.9.8" %} package: name: {{ name|lower }} @@ -7,12 +7,12 @@ package: source: url: https://github.com/g-truc/glm/releases/download/{{ version }}/glm-{{ version }}.zip - sha256: 972b8c319ff1b96eeac19c63563176f138527ebf6fa5110b8eac5fe23f5e7d9f + sha256: 37e2a3d62ea3322e43593c34bae29f57e3e251ea89f4067506c94043769ade4c patches: - patches/macos_test_errors.patch build: - number: 2 + number: 0 skip: true # [win and vc<14] requirements: From 9e3b21666aab50d626e7a9bf139c572ae3304e12 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 22 Feb 2023 13:04:42 +0000 Subject: [PATCH 02/12] MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.22.1, and conda-forge-pinning 2023.02.20.16.09.03 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .azure-pipelines/azure-pipelines-win.yml | 6 +++++- .ci_support/linux_64_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 5 ++--- README.md | 8 ++++---- 10 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 84d4f42..8032e96 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-10.15 + vmImage: macOS-11 strategy: matrix: osx_64_: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a0bcae..a192c0b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,6 +14,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -35,7 +36,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -72,6 +73,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index ffbda61..e4b57e4 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '11' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 5bee13e..678999b 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 598a092..3fe6602 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '13' +- '14' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 427ade5..f2f006f 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -3,7 +3,7 @@ channel_sources: channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2019 target_platform: - win-64 vc: diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..84431a6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a..b3abaeb 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index 2528e66..cdf3b4e 100644 --- a/README.md +++ b/README.md @@ -32,28 +32,28 @@ Current build status linux_64 - variant + variant osx_64 - variant + variant osx_arm64 - variant + variant win_64 - variant + variant From 157c55c47964f7d2fcb163a8c3a90d1ace0a0200 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 22 Feb 2023 14:12:46 +0100 Subject: [PATCH 03/12] Update macos_test_errors.patch --- recipe/patches/macos_test_errors.patch | 27 ++++++++------------------ 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/recipe/patches/macos_test_errors.patch b/recipe/patches/macos_test_errors.patch index c60cbef..ebbd419 100644 --- a/recipe/patches/macos_test_errors.patch +++ b/recipe/patches/macos_test_errors.patch @@ -1,24 +1,13 @@ -From 3211722dd24bd3a1e10addb8e6df8522b73dd7f5 Mon Sep 17 00:00:00 2001 -From: Liam Wang <5054950+wangl5@users.noreply.github.com> -Date: Wed, 29 Jun 2022 21:01:58 -0400 -Subject: [PATCH] Disable warnings as errors - ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 10bb1af..2d31596 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -211,6 +211,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index e7f85f19f..e67a448f2 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -197,7 +197,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + message("GLM: Clang - ${CMAKE_CXX_COMPILER_ID} compiler") endif() - add_compile_options(-Werror -Weverything) -+ add_compile_options(-Wno-error=implicit-int-conversion -Wno-error=implicit-int-float-conversion -Wno-error=unused-but-set-variable) +- add_compile_options(-Werror -Weverything) ++ #add_compile_options(-Werror -Weverything) add_compile_options(-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++11-long-long -Wno-padded -Wno-gnu-anonymous-struct -Wno-nested-anon-types) add_compile_options(-Wno-undefined-reinterpret-cast -Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros -Wno-format-nonliteral) --- -2.32.1 (Apple Git-133) - From 178b60511cd43ec0a90b6fff9a74c1fc95e84570 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 22 Feb 2023 14:27:20 +0100 Subject: [PATCH 04/12] Create cmake_install_target.patch --- recipe/patches/cmake_install_target.patch | 73 +++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 recipe/patches/cmake_install_target.patch diff --git a/recipe/patches/cmake_install_target.patch b/recipe/patches/cmake_install_target.patch new file mode 100644 index 0000000..943c175 --- /dev/null +++ b/recipe/patches/cmake_install_target.patch @@ -0,0 +1,73 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,15 +1,40 @@ +-cmake_minimum_required(VERSION 3.2 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.20 FATAL_ERROR) + cmake_policy(VERSION 3.2) + +-set(GLM_VERSION "0.9.9") ++file(READ "glm/detail/setup.hpp" GLM_SETUP_FILE) ++string(REGEX MATCH "#define[ ]+GLM_VERSION_MAJOR[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) ++set(GLM_VERSION_MAJOR "${CMAKE_MATCH_1}") ++string(REGEX MATCH "#define[ ]+GLM_VERSION_MINOR[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) ++set(GLM_VERSION_MINOR "${CMAKE_MATCH_1}") ++string(REGEX MATCH "#define[ ]+GLM_VERSION_PATCH[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) ++set(GLM_VERSION_PATCH "${CMAKE_MATCH_1}") ++string(REGEX MATCH "#define[ ]+GLM_VERSION_REVISION[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) ++set(GLM_VERSION_REVISION "${CMAKE_MATCH_1}") ++ ++set(GLM_VERSION ${GLM_VERSION_MAJOR}.${GLM_VERSION_MINOR}.${GLM_VERSION_PATCH}.${GLM_VERSION_REVISION}) + project(glm VERSION ${GLM_VERSION} LANGUAGES CXX) + enable_testing() + ++include(GNUInstallDirs) ++ + add_subdirectory(glm) + add_library(glm::glm ALIAS glm) + + 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_DATADIR}/cmake/glm NAMESPACE glm::) ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file("glmConfigVersion.cmake" COMPATIBILITY AnyNewerVersion ARCH_INDEPENDENT) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/glm) ++ ++cmake_path(APPEND PKGCONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") ++configure_file("cmake/glm.pc.in" "glm.pc" @ONLY) ++install( ++ FILES "${CMAKE_CURRENT_BINARY_DIR}/glm.pc" ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ++) ++ + add_subdirectory(test) + + endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) +--- /dev/null ++++ b/cmake/glm.pc.in +@@ -0,0 +1,8 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++includedir=@PKGCONFIG_INCLUDEDIR@ ++ ++Name: GLM ++Description: OpenGL Mathematics ++URL: https://glm.g-truc.net ++Version: @GLM_VERSION@ ++Cflags: -I${includedir} +--- a/glm/CMakeLists.txt ++++ b/glm/CMakeLists.txt +@@ -43,7 +43,13 @@ source_group("SIMD Files" FILES ${SIMD_I + source_group("SIMD Files" FILES ${SIMD_HEADER}) + + add_library(glm INTERFACE) +-target_include_directories(glm INTERFACE ../) ++ ++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} From eefa17b79939020f16b7097139ba1fb737fb8cb0 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 22 Feb 2023 14:27:37 +0100 Subject: [PATCH 05/12] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1aac2a2..9f5a1fd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,6 +10,7 @@ source: sha256: 37e2a3d62ea3322e43593c34bae29f57e3e251ea89f4067506c94043769ade4c patches: - patches/macos_test_errors.patch + - patches/cmake_install_target.patch build: number: 0 From d6d094b9ee2b78e354638254e70e5a0dde306fdc Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 22 Feb 2023 14:54:32 +0100 Subject: [PATCH 06/12] fix wrong line endings --- recipe/patches/cmake_install_target.patch | 146 +++++++++++----------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/recipe/patches/cmake_install_target.patch b/recipe/patches/cmake_install_target.patch index 943c175..7bcf101 100644 --- a/recipe/patches/cmake_install_target.patch +++ b/recipe/patches/cmake_install_target.patch @@ -1,73 +1,73 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,15 +1,40 @@ --cmake_minimum_required(VERSION 3.2 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.20 FATAL_ERROR) - cmake_policy(VERSION 3.2) - --set(GLM_VERSION "0.9.9") -+file(READ "glm/detail/setup.hpp" GLM_SETUP_FILE) -+string(REGEX MATCH "#define[ ]+GLM_VERSION_MAJOR[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) -+set(GLM_VERSION_MAJOR "${CMAKE_MATCH_1}") -+string(REGEX MATCH "#define[ ]+GLM_VERSION_MINOR[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) -+set(GLM_VERSION_MINOR "${CMAKE_MATCH_1}") -+string(REGEX MATCH "#define[ ]+GLM_VERSION_PATCH[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) -+set(GLM_VERSION_PATCH "${CMAKE_MATCH_1}") -+string(REGEX MATCH "#define[ ]+GLM_VERSION_REVISION[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) -+set(GLM_VERSION_REVISION "${CMAKE_MATCH_1}") -+ -+set(GLM_VERSION ${GLM_VERSION_MAJOR}.${GLM_VERSION_MINOR}.${GLM_VERSION_PATCH}.${GLM_VERSION_REVISION}) - project(glm VERSION ${GLM_VERSION} LANGUAGES CXX) - enable_testing() - -+include(GNUInstallDirs) -+ - add_subdirectory(glm) - add_library(glm::glm ALIAS glm) - - 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_DATADIR}/cmake/glm NAMESPACE glm::) -+include(CMakePackageConfigHelpers) -+write_basic_package_version_file("glmConfigVersion.cmake" COMPATIBILITY AnyNewerVersion ARCH_INDEPENDENT) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/glm) -+ -+cmake_path(APPEND PKGCONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") -+configure_file("cmake/glm.pc.in" "glm.pc" @ONLY) -+install( -+ FILES "${CMAKE_CURRENT_BINARY_DIR}/glm.pc" -+ DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" -+) -+ - add_subdirectory(test) - - endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) ---- /dev/null -+++ b/cmake/glm.pc.in -@@ -0,0 +1,8 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+includedir=@PKGCONFIG_INCLUDEDIR@ -+ -+Name: GLM -+Description: OpenGL Mathematics -+URL: https://glm.g-truc.net -+Version: @GLM_VERSION@ -+Cflags: -I${includedir} ---- a/glm/CMakeLists.txt -+++ b/glm/CMakeLists.txt -@@ -43,7 +43,13 @@ source_group("SIMD Files" FILES ${SIMD_I - source_group("SIMD Files" FILES ${SIMD_HEADER}) - - add_library(glm INTERFACE) --target_include_directories(glm INTERFACE ../) -+ -+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} +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,15 +1,40 @@ +-cmake_minimum_required(VERSION 3.2 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.20 FATAL_ERROR) + cmake_policy(VERSION 3.2) + +-set(GLM_VERSION "0.9.9") ++file(READ "glm/detail/setup.hpp" GLM_SETUP_FILE) ++string(REGEX MATCH "#define[ ]+GLM_VERSION_MAJOR[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) ++set(GLM_VERSION_MAJOR "${CMAKE_MATCH_1}") ++string(REGEX MATCH "#define[ ]+GLM_VERSION_MINOR[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) ++set(GLM_VERSION_MINOR "${CMAKE_MATCH_1}") ++string(REGEX MATCH "#define[ ]+GLM_VERSION_PATCH[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) ++set(GLM_VERSION_PATCH "${CMAKE_MATCH_1}") ++string(REGEX MATCH "#define[ ]+GLM_VERSION_REVISION[ ]+([0-9]+)" _ ${GLM_SETUP_FILE}) ++set(GLM_VERSION_REVISION "${CMAKE_MATCH_1}") ++ ++set(GLM_VERSION ${GLM_VERSION_MAJOR}.${GLM_VERSION_MINOR}.${GLM_VERSION_PATCH}.${GLM_VERSION_REVISION}) + project(glm VERSION ${GLM_VERSION} LANGUAGES CXX) + enable_testing() + ++include(GNUInstallDirs) ++ + add_subdirectory(glm) + add_library(glm::glm ALIAS glm) + + 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_DATADIR}/cmake/glm NAMESPACE glm::) ++include(CMakePackageConfigHelpers) ++write_basic_package_version_file("glmConfigVersion.cmake" COMPATIBILITY AnyNewerVersion ARCH_INDEPENDENT) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/glm) ++ ++cmake_path(APPEND PKGCONFIG_INCLUDEDIR "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") ++configure_file("cmake/glm.pc.in" "glm.pc" @ONLY) ++install( ++ FILES "${CMAKE_CURRENT_BINARY_DIR}/glm.pc" ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ++) ++ + add_subdirectory(test) + + endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) +--- /dev/null ++++ b/cmake/glm.pc.in +@@ -0,0 +1,8 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++includedir=@PKGCONFIG_INCLUDEDIR@ ++ ++Name: GLM ++Description: OpenGL Mathematics ++URL: https://glm.g-truc.net ++Version: @GLM_VERSION@ ++Cflags: -I${includedir} +--- a/glm/CMakeLists.txt ++++ b/glm/CMakeLists.txt +@@ -43,7 +43,13 @@ source_group("SIMD Files" FILES ${SIMD_I + source_group("SIMD Files" FILES ${SIMD_HEADER}) + + add_library(glm INTERFACE) +-target_include_directories(glm INTERFACE ../) ++ ++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} From eddfcd31a5ca52362a0fad2c6bd596ffd80742d4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 22 Feb 2023 16:56:20 +0100 Subject: [PATCH 07/12] Update build.sh --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 4308bf4..6699b02 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -12,5 +12,5 @@ cmake ${CMAKE_ARGS} \ make install if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then -ctest +ctest --output-on-failure fi From 262888ba1832c1deeb6f93e26eb98c1d1c7fb3c5 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 22 Feb 2023 16:56:29 +0100 Subject: [PATCH 08/12] Update bld.bat --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 702c760..a969dd0 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -11,5 +11,5 @@ if errorlevel 1 exit 1 cmake --build . --config Release --target install if errorlevel 1 exit 1 -ctest +ctest --output-on-failure if errorlevel 1 exit 1 From 85ef68779bd07e510bc5abac885c6ab5004d9e89 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 22 Feb 2023 23:21:51 +0100 Subject: [PATCH 09/12] Update build.sh --- recipe/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 6699b02..ffd7f80 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -12,5 +12,6 @@ cmake ${CMAKE_ARGS} \ make install if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then -ctest --output-on-failure +# test-core_func_integer is a known test failure on GCC 11 +ctest --output-on-failure -E "test-core_func_integer" fi From ef0f0f39502b57d6752084f130edb85eb052619d Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 21 Apr 2023 15:38:16 +0200 Subject: [PATCH 10/12] Update meta.yaml --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9f5a1fd..e6a663c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,3 +38,5 @@ about: extra: recipe-maintainers: - mcs07 + - traversaro + From 778691cb5f851a08cf0c3554bdf11ec5b5fa36bc Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 21 Apr 2023 15:38:50 +0200 Subject: [PATCH 11/12] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e6a663c..0745699 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,4 +39,3 @@ extra: recipe-maintainers: - mcs07 - traversaro - From 2946f2e6b067cad275b8f83d1ce1ed4b3ef93927 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 13:44:44 +0000 Subject: [PATCH 12/12] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.04.21.02.17.00 --- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- .ci_support/linux_64_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .github/CODEOWNERS | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 9 +++++---- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a192c0b..8a96a72 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_: @@ -36,7 +36,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index e4b57e4..f6b4424 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 678999b..12bf16e 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 3fe6602..6511b26 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2cbaf5d..7e80d44 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @mcs07 \ No newline at end of file +* @mcs07 @traversaro \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a6..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b3abaeb..bb00584 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index cdf3b4e..aacf20b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About glm -========= +About glm-feedstock +=================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/glm-feedstock/blob/main/LICENSE.txt) Home: https://glm.g-truc.net Package license: MIT -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/glm-feedstock/blob/main/LICENSE.txt) - Summary: OpenGL Mathematics Development: https://github.com/g-truc/glm @@ -186,4 +186,5 @@ Feedstock Maintainers ===================== * [@mcs07](https://github.com/mcs07/) +* [@traversaro](https://github.com/traversaro/)