1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
From f69772741e89fca8d3b98629bc79469e2d55864c Mon Sep 17 00:00:00 2001
From: NRK <nrk@disroot.org>
Date: Fri, 7 Mar 2025 21:06:56 +0000
Subject: [PATCH 2/3] disable static library
---
CMakeLists.txt | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c064a7..d21c6cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,6 @@ set ( ly_src_dir ${ly_base_dir}/source )
set ( ly_inc_dir ${ly_base_dir}/include )
set ( ly_tst_dir ${ly_base_dir}/unit_test )
set ( ly_lib_name yuv )
-set ( ly_lib_static ${ly_lib_name} )
set ( ly_lib_shared ${ly_lib_name}_shared )
# We cannot use GLOB here since we want to be able to separate out files that
@@ -174,9 +173,6 @@ if(LOONGARCH64)
endif()
endif()
-# this creates the static library (.a)
-add_library( ${ly_lib_static} STATIC ${ly_lib_parts})
-
# this creates the shared library (.so)
add_library( ${ly_lib_shared} SHARED ${ly_lib_parts})
set_target_properties( ${ly_lib_shared} PROPERTIES OUTPUT_NAME "${ly_lib_name}" )
@@ -187,15 +183,15 @@ endif()
# this creates the cpuid tool
add_executable ( cpuid ${ly_base_dir}/util/cpuid.c )
-target_link_libraries ( cpuid ${ly_lib_static} )
+target_link_libraries ( cpuid ${ly_lib_shared} )
# this creates the conversion tool
add_executable ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc )
-target_link_libraries ( yuvconvert ${ly_lib_static} )
+target_link_libraries ( yuvconvert ${ly_lib_shared} )
# this creates the yuvconstants tool
add_executable ( yuvconstants ${ly_base_dir}/util/yuvconstants.c )
-target_link_libraries ( yuvconstants ${ly_lib_static} )
+target_link_libraries ( yuvconstants ${ly_lib_shared} )
find_package ( JPEG )
if (JPEG_FOUND)
@@ -248,7 +244,6 @@ endif()
# install the conversion tool, .so, .a, and all the header files
install ( TARGETS yuvconvert DESTINATION ${CMAKE_INSTALL_BINDIR} )
-install ( TARGETS ${ly_lib_static} DESTINATION ${CMAKE_INSTALL_LIBDIR} )
install ( TARGETS ${ly_lib_shared} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION bin ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
install ( DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
--
2.48.1
|
