From e3d237901ddd757b8f0f17dc3ed3a7e4c73f96fe Mon Sep 17 00:00:00 2001 From: Bernard Laberge Date: Mon, 23 Jan 2023 17:27:05 -0500 Subject: [PATCH] Fix atomics ops download fail during windows build Signed-off-by: Bernard Laberge --- cmake/dependencies/atomic_ops.cmake | 12 ++++-------- src/lib/app/RvCommon/RvCommon/generated/.gitignore | 3 ++- src/lib/files/Gto/Gto/generated/.gitignore | 2 ++ src/lib/mu/MuLang/generated/.gitignore | 2 ++ 4 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 src/lib/files/Gto/Gto/generated/.gitignore create mode 100644 src/lib/mu/MuLang/generated/.gitignore diff --git a/cmake/dependencies/atomic_ops.cmake b/cmake/dependencies/atomic_ops.cmake index 70c0e736..704079fa 100644 --- a/cmake/dependencies/atomic_ops.cmake +++ b/cmake/dependencies/atomic_ops.cmake @@ -15,17 +15,13 @@ SET(_version "7.7.0" ) -# Download the latest version because the feature we need (--disable-gpl) -# has not been released nor tagged yet -# SET(_download_url -# "https://github.com/ivmai/libatomic_ops/archive/refs/tags/v${_version}.zip" -# ) +# Download a recent version that includes the feature we need (--disable-gpl) which hasn't been released nor tagged yet. SET(_download_url - "https://github.com/ivmai/libatomic_ops/archive/refs/heads/master.zip" + "https://github.com/ivmai/libatomic_ops/archive/044573903530c4a8e8318e20a830d4a0531b2035.zip" ) SET(_download_hash - 8da38242d61d746e070e021a735798b9 + cc7fad1e71b3064abe1ea821ae9a9a6e ) SET(_install_dir @@ -111,7 +107,7 @@ SET_PROPERTY( ) SET(_include_dir - ${_install_dir}/include + ${_install_dir}/include ) FILE(MAKE_DIRECTORY ${_include_dir}) TARGET_INCLUDE_DIRECTORIES( diff --git a/src/lib/app/RvCommon/RvCommon/generated/.gitignore b/src/lib/app/RvCommon/RvCommon/generated/.gitignore index f59ec20a..d6b7ef32 100644 --- a/src/lib/app/RvCommon/RvCommon/generated/.gitignore +++ b/src/lib/app/RvCommon/RvCommon/generated/.gitignore @@ -1 +1,2 @@ -* \ No newline at end of file +* +!.gitignore diff --git a/src/lib/files/Gto/Gto/generated/.gitignore b/src/lib/files/Gto/Gto/generated/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/src/lib/files/Gto/Gto/generated/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/src/lib/mu/MuLang/generated/.gitignore b/src/lib/mu/MuLang/generated/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/src/lib/mu/MuLang/generated/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore