mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-22 05:23:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

sci-electronics/slang: fix bugs and bump to 2.0

Browse Source 
Signed-off-by: Huang Rui <vowstar@gmail.com>
This commit is contained in:
Huang Rui
2022-11-03 15:09:54 +08:00
parent 9174842be9
commit 2174b583aa
5 changed files with 151 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
sci-electronics/slang/files/slang-2.0-fix-lib-path.patch Normal file
View File

@@ -0,0 +1,64 @@
From 16ef772ec581e929197eae35ef99993e4d7c8dbb Mon Sep 17 00:00:00 2001
From: Huang Rui <vowstar@gmail.com>
Date: Thu, 3 Nov 2022 12:04:42 +0800
Subject: [PATCH] external/CMakeLists.txt: fix find_pkg when unordered_dense
installed
If the user has already installed unordered_dense beforehand,
avoid downloading and installing again.
Applicable when the distribution has packaged unordered_dense.
Signed-off-by: Huang Rui <vowstar@gmail.com>
---
external/CMakeLists.txt | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 97e0e79c7..6eb30989a 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -27,11 +27,17 @@ if((SLANG_INCLUDE_PYLIB OR BUILD_SHARED_LIBS) AND NOT fmt_FOUND)
set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
+set(find_pkg_args "")
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24.0")
+ set(find_pkg_args "FIND_PACKAGE_ARGS" "2.0.0")
+endif()
+
FetchContent_Declare(
unordered_dense
GIT_REPOSITORY https://github.com/martinus/unordered_dense.git
GIT_TAG v2.0.0
- GIT_SHALLOW ON)
+ GIT_SHALLOW ON
+ ${find_pkg_args})
FetchContent_MakeAvailable(unordered_dense)
if(SLANG_INCLUDE_INSTALL)
@@ -44,10 +50,12 @@ if(SLANG_INCLUDE_INSTALL)
${PROJECT_SOURCE_DIR}/external/span.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
COMPONENT slang_Development)
- install(
- DIRECTORY ${unordered_dense_SOURCE_DIR}/include/ankerl
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- COMPONENT slang_Development)
+ if(NOT unordered_dense_FOUND)
+ install(
+ DIRECTORY ${unordered_dense_SOURCE_DIR}/include/ankerl
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ COMPONENT slang_Development)
+ endif()
if(NOT fmt_FOUND)
install(
@@ -59,5 +67,7 @@ if(SLANG_INCLUDE_INSTALL)
PRIVATE_HEADER EXCLUDE_FROM_ALL)
endif()
- install(TARGETS unordered_dense EXPORT slangTargets)
+ if(NOT unordered_dense_FOUND)
+ install(TARGETS unordered_dense EXPORT slangTargets)
+ endif()
endif()