git: c0c9c4917cd7 - main - devel/sd-mux-ctrl: Improve the patch.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 17 Oct 2021 20:24:31 UTC
The branch main has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c0c9c4917cd79b46afad9a67cd1df705fd308bbb
commit c0c9c4917cd79b46afad9a67cd1df705fd308bbb
Author: Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2021-10-17 11:42:59 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2021-10-17 20:24:24 +0000
devel/sd-mux-ctrl: Improve the patch.
---
devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt b/devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt
index ada33a872153..4c3432a360ad 100644
--- a/devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt
+++ b/devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt
@@ -1,12 +1,19 @@
---- src/CMakeLists.txt.orig 2020-02-17 16:20:18 UTC
+--- src/CMakeLists.txt.orig 2021-10-17 11:41:58 UTC
+++ src/CMakeLists.txt
-@@ -37,6 +37,9 @@ INCLUDE_DIRECTORIES(
+@@ -35,6 +35,7 @@ SET(SDMUXCTRL_SOURCES
+ INCLUDE_DIRECTORIES(
+ ${SDMUXCTRL_PATH}
${FTD2XX_PATH}
++ ${SDMUX_DEP_INCLUDE_DIRS}
)
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${SDMUX_DEP_popt_INCLUDEDIR}")
-+SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${SDMUX_DEP_popt_LIBDIR}")
-+
ADD_EXECUTABLE(${TARGET_SDMUXCTRL} ${SDMUXCTRL_SOURCES})
+@@ -45,7 +46,7 @@ TARGET_INCLUDE_DIRECTORIES(${TARGET_SDMUXCTRL} PUBLIC
TARGET_LINK_LIBRARIES(${TARGET_SDMUXCTRL}
+ ${SDMUX_DEP_LDFLAGS}
+- ${SDMUX_DEP_LIBRARIES}
++ ${SDMUX_DEP_LINK_LIBRARIES}
+ )
+
+ INSTALL(TARGETS ${TARGET_SDMUXCTRL} DESTINATION ${BIN_INSTALL_DIR})