kopia lustrzana https://github.com/stlink-org/stlink
Drop guipath.patch and refresh cross.patch for v1.7.0
rodzic
729ef9d3cd
commit
30396b2803
|
@ -1,11 +1,11 @@
|
|||
--- stlink-1.6.1+ds.orig/CMakeLists.txt
|
||||
+++ stlink-1.6.1+ds/CMakeLists.txt
|
||||
@@ -48,7 +48,7 @@
|
||||
find_package(libusb REQUIRED)
|
||||
--- a/src/stlink-gui/CMakeLists.txt
|
||||
+++ b/src/stlink-gui/CMakeLists.txt
|
||||
@@ -2,7 +2,7 @@
|
||||
# Build GUI
|
||||
###
|
||||
|
||||
## Package configuration (pkg-config) on unix-based systems
|
||||
-if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
|
||||
+if (NOT WIN32)
|
||||
#add_subdirectory(cmake/pkgconfig)
|
||||
find_package(PkgConfig)
|
||||
pkg_check_modules(GTK3 gtk+-3.0)
|
||||
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/src/stlink-gui/CMakeLists.txt
|
||||
+++ b/src/stlink-gui/CMakeLists.txt
|
||||
@@ -32,7 +32,7 @@
|
||||
add_executable(stlink-gui ${GUI_SOURCES})
|
||||
install(FILES stlink-gui.ui DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
set_target_properties(stlink-gui PROPERTIES
|
||||
- COMPILE_DEFINITIONS STLINK_UI_DIR="${CMAKE_INSTALL_PREFIX}/bin")
|
||||
+ COMPILE_DEFINITIONS STLINK_UI_DIR="/usr/share/stlink")
|
||||
target_link_libraries(stlink-gui ${STLINK_LIB_SHARED} ${SSP_LIB} ${GTK3_LDFLAGS})
|
||||
install(TARGETS stlink-gui DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
|
@ -1,2 +1 @@
|
|||
guipath.patch
|
||||
cross.patch
|
||||
|
|
Ładowanie…
Reference in New Issue