kopia lustrzana https://github.com/stlink-org/stlink
Unified naming for cmake modules & paths
rodzic
264417e4b3
commit
155439230a
|
@ -53,7 +53,7 @@ endif ()
|
|||
# Dependencies
|
||||
###
|
||||
|
||||
find_package(LibUSB REQUIRED)
|
||||
find_package(libusb REQUIRED)
|
||||
|
||||
if (NOT APPLE AND NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
|
||||
find_package(PkgConfig)
|
||||
|
@ -243,7 +243,7 @@ add_subdirectory(src/stlink-gui)
|
|||
# Others
|
||||
###
|
||||
|
||||
add_subdirectory(debian/pkgconfig)
|
||||
add_subdirectory(debian/pkg-config)
|
||||
add_subdirectory(include) ### TODO: Check path
|
||||
add_subdirectory(doc/man)
|
||||
add_subdirectory(tests)
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
# Find7zip.cmake
|
||||
# Detect 7zip file archiver on Windows systems to extract (zip-)archives
|
||||
|
||||
|
||||
find_program(
|
||||
ZIP_EXECUTABLE NAMES 7z.exe p7zip
|
||||
HINTS "C:\\Program Files\\7-Zip\\" "C:\\Program Files (x86)\\7-Zip\\"
|
|
@ -1,4 +1,4 @@
|
|||
# FindLibUSB.cmake
|
||||
# Findlibusb.cmake
|
||||
# Once done this will define
|
||||
#
|
||||
# LIBUSB_FOUND libusb present on system
|
||||
|
@ -75,7 +75,7 @@ elseif (WIN32 OR (EXISTS "/etc/debian_version" AND ${CMAKE_BUILD_TYPE} MATCHES "
|
|||
|
||||
if (NOT LIBUSB_FOUND OR EXISTS "/etc/debian_version")
|
||||
# Preparations for installing libusb library
|
||||
find_package(7Zip REQUIRED)
|
||||
find_package(7zip REQUIRED)
|
||||
set(LIBUSB_WIN_VERSION 1.0.23) # set libusb version
|
||||
set(LIBUSB_WIN_ARCHIVE libusb-${LIBUSB_WIN_VERSION}.7z)
|
||||
set(LIBUSB_WIN_ARCHIVE_PATH ${CMAKE_BINARY_DIR}/${LIBUSB_WIN_ARCHIVE})
|
|
@ -1,5 +1,4 @@
|
|||
usr/include/*
|
||||
usr/lib/*/lib*.a
|
||||
usr/lib/*/pkgconfig/*
|
||||
usr/lib/*/pkg-config/*
|
||||
usr/lib/*/lib*.so
|
||||
|
||||
|
|
|
@ -11,5 +11,5 @@ configure_file(
|
|||
|
||||
install(
|
||||
FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
|
||||
DESTINATION ${STLINK_LIBRARY_PATH}/pkgconfig/
|
||||
DESTINATION ${STLINK_LIBRARY_PATH}/pkg-config/
|
||||
)
|
|
@ -8,4 +8,3 @@ includedir=${PKG_CONFIG_INCLUDEDIR}
|
|||
libdir=${PKG_CONFIG_LIBDIR}
|
||||
Libs: ${PKG_CONFIG_LIBS}
|
||||
Cflags: ${PKG_CONFIG_CFLAGS}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
if (NOT gtk_FOUND)
|
||||
message(STATUS "gtk not found!")
|
||||
return()
|
||||
return() # no GTK present => no GUI build
|
||||
endif ()
|
||||
|
||||
set(GUI_SOURCES gui.c gui.h)
|
||||
|
|
Ładowanie…
Reference in New Issue