sci-electronics/slang: drop 1.0, 2.0-r2, 3.0

Signed-off-by: Steffen Winter <steffen.winter@proton.me>
This commit is contained in:
Steffen Winter
2024-03-01 14:11:14 +01:00
parent 9425143319
commit a402ee97f2
7 changed files with 0 additions and 319 deletions

View File

@@ -1,26 +0,0 @@
From b821c33c391814ac332d6a85783179e084d1345a Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 20 Nov 2022 21:23:24 +0000
Subject: [PATCH] Fix library name in sv-lang.pc.in (#661)
---
scripts/sv-lang.pc.in | 4 +-
1 file changed, 2 insertion(+), 2 deletion(-)
diff --git a/scripts/sv-lang.pc.in b/scripts/sv-lang.pc.in
index eabfbc9a..fc6191b7 100644
--- a/scripts/sv-lang.pc.in
+++ b/scripts/sv-lang.pc.in
@@ -2,9 +2,9 @@
includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@"
libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
-Name: @PROJECT_NAME@
+Name: svlang
Description: @PROJECT_DESCRIPTION@
URL: @PROJECT_HOMEPAGE_URL@
Version: @PROJECT_VERSION@
Cflags: -I"${includedir}"
-Libs: -L"${libdir}" -lslang
+Libs: -L"${libdir}" -lsvlang

View File

@@ -1,64 +0,0 @@
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()

View File

@@ -1,32 +0,0 @@
From a3bf429c886407198e7e3a292af80e6c60ee27d2 Mon Sep 17 00:00:00 2001
From: jrudess <jordan.r.rudess@gmail.com>
Date: Sat, 5 Nov 2022 16:24:04 -0700
Subject: [PATCH] Provide cmake override for shared-lib name
---
source/CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 58b73678..f9ac7cd4 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -86,6 +86,7 @@ add_library(
add_subdirectory(ast)
+set(SLANG_SHARED_LIB_NAME svlang)
add_library(slang::slang ALIAS slang_slang)
set_target_properties(
slang_slang
@@ -93,8 +94,8 @@ set_target_properties(
VISIBILITY_INLINES_HIDDEN YES
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR}
- EXPORT_NAME slang
- OUTPUT_NAME slang)
+ EXPORT_NAME ${SLANG_SHARED_LIB_NAME}
+ OUTPUT_NAME ${SLANG_SHARED_LIB_NAME})
# Compile options
target_compile_options(slang_slang PRIVATE ${SLANG_WARN_FLAGS})