Skip to content

Commit def1a45

Browse files
committed
yuv skip jpeg
1 parent 9d7d82e commit def1a45

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

patches/yuv/0001-not-install-binary-and-shared-lib.patch renamed to patches/yuv/0001-skip-binary-and-shared-lib-and-jpeg.patch

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 95dd62cea5e195f51a7ec25041b072d47aa63fa9 Mon Sep 17 00:00:00 2001
1+
From adaf7690b34ade92e3cfb0af812ec8c534381b12 Mon Sep 17 00:00:00 2001
22
From: qianlongxu <[email protected]>
3-
Date: Tue, 14 Jan 2025 17:38:01 +0800
4-
Subject: [PATCH] not install binary and shared lib
3+
Date: Tue, 14 Jan 2025 17:53:31 +0800
4+
Subject: [PATCH] skip binary and shared lib and jpeg
55

66
---
77
CMakeLists.txt | 17 +++++++++++++++--
88
1 file changed, 15 insertions(+), 2 deletions(-)
99

1010
diff --git a/CMakeLists.txt b/CMakeLists.txt
11-
index 636531e..52a6b95 100644
11+
index 636531e..47b9759 100644
1212
--- a/CMakeLists.txt
1313
+++ b/CMakeLists.txt
1414
@@ -5,6 +5,7 @@
@@ -19,7 +19,7 @@ index 636531e..52a6b95 100644
1919

2020
SET ( ly_base_dir ${PROJECT_SOURCE_DIR} )
2121
SET ( ly_src_dir ${ly_base_dir}/source )
22-
@@ -25,15 +26,19 @@ INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} )
22+
@@ -25,22 +26,26 @@ INCLUDE_DIRECTORIES( BEFORE ${ly_inc_dir} )
2323
# this creates the static library (.a)
2424
ADD_LIBRARY ( ${ly_lib_static} STATIC ${ly_source_files} )
2525

@@ -35,11 +35,18 @@ index 636531e..52a6b95 100644
3535
+if(BINARY)
3636
ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc )
3737
TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} )
38-
-
39-
+endif()
4038

39+
-
4140
INCLUDE ( FindJPEG )
4241
if (JPEG_FOUND)
42+
include_directories( ${JPEG_INCLUDE_DIR} )
43+
target_link_libraries( yuvconvert ${JPEG_LIBRARY} )
44+
add_definitions( -DHAVE_JPEG )
45+
endif()
46+
+endif()
47+
48+
if(TEST)
49+
find_library(GTEST_LIBRARY gtest)
4350
@@ -75,9 +80,17 @@ endif()
4451

4552

0 commit comments

Comments
 (0)