Changeset View
Changeset View
Standalone View
Standalone View
devel/sd-mux-ctrl/files/patch-src_CMakeLists.txt
- This file was moved from devel/sd-mux/files/patch-src_CMakeLists.txt.
| --- src/CMakeLists.txt.orig 2020-02-17 16:20:18 UTC | --- src/CMakeLists.txt.orig 2020-02-17 16:20:18 UTC | ||||
| +++ src/CMakeLists.txt | +++ src/CMakeLists.txt | ||||
| @@ -37,6 +37,9 @@ INCLUDE_DIRECTORIES( | @@ -37,6 +37,9 @@ INCLUDE_DIRECTORIES( | ||||
| ${FTD2XX_PATH} | ${FTD2XX_PATH} | ||||
| ) | ) | ||||
| +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${SDMUX_DEP_popt_INCLUDEDIR}") | +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}") | +SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${SDMUX_DEP_popt_LIBDIR}") | ||||
| + | + | ||||
| ADD_EXECUTABLE(${TARGET_SDMUXCTRL} ${SDMUXCTRL_SOURCES}) | ADD_EXECUTABLE(${TARGET_SDMUXCTRL} ${SDMUXCTRL_SOURCES}) | ||||
| TARGET_LINK_LIBRARIES(${TARGET_SDMUXCTRL} | TARGET_LINK_LIBRARIES(${TARGET_SDMUXCTRL} | ||||
swills: Someone who knows CMake better should say if this patch or the other are better in some way or… | |||||
Done Inline ActionsI just kept the patch as before and it works as expected, i.e. nothing was changed. For the upstream question of the patches, I'm agreed and I think it should be chased during the next release update. sbz: I just kept the patch as before and it works as expected, i.e. nothing was changed. For the… | |||||
Not Done Inline Actions
swills: > I just kept the patch as before and it works as expected, i.e. nothing was changed. For the… | |||||
Not Done Inline ActionsI think the other one is more upstreamable and we should use that one. That said, @gonzo tried and they were unresponsive. There's a link to the upstream submission somewhere in the thread at https://twitter.com/kernelnomicon/status/1284230380887789568 I think. emaste: I think the other one is more upstreamable and we should use that one. That said, @gonzo tried… | |||||
Someone who knows CMake better should say if this patch or the other are better in some way or more upstream-able. I suspect the other one is. Have we tried to get either upstream? I don't think I bothered with mine, but we should. Upstream-ing shouldn't hold up this change, but we should decide which patch will work upstream and stick with that for this change.