Moved unused pkg-config settings to /doc/dev

(Closes #971)
pull/978/head
nightwalker-87 2020-06-03 20:02:09 +02:00
rodzic b0dcb0cd39
commit ade735dd67
9 zmienionych plików z 67 dodań i 59 usunięć

2
.gitignore vendored
Wyświetl plik

@ -1,5 +1,5 @@
build build
build-mingw build-mingw
.project
obj-* obj-*
*.user* *.user*
.project

Wyświetl plik

@ -47,13 +47,6 @@ endif ()
find_package(libusb REQUIRED) find_package(libusb REQUIRED)
## Package configuration (pkg-config) on unix-based systems
if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
#add_subdirectory(cmake/pkgconfig)
find_package(PkgConfig)
pkg_check_modules(GTK3 gtk+-3.0)
endif ()
## Check for system-specific additional header files and libraries ## Check for system-specific additional header files and libraries
include(CheckIncludeFile) include(CheckIncludeFile)

Wyświetl plik

@ -88,7 +88,6 @@ Install the following packages from your package repository:
* `build-essential` (on Debian based distros (Debian, Ubuntu)) * `build-essential` (on Debian based distros (Debian, Ubuntu))
* `cmake` (3.4.2 or later, use the latest version available from the repository) * `cmake` (3.4.2 or later, use the latest version available from the repository)
* `rpm` (on Debian based distros (Debian, Ubuntu), needed for package build with `make package`) * `rpm` (on Debian based distros (Debian, Ubuntu), needed for package build with `make package`)
* `pkg-config`
* `libusb-1.0` * `libusb-1.0`
* `libusb-1.0-0-dev` (development headers for building) * `libusb-1.0-0-dev` (development headers for building)
* `libgtk-3-dev` (_optional_, needed for `stlink-gui`) * `libgtk-3-dev` (_optional_, needed for `stlink-gui`)
@ -194,7 +193,6 @@ Then install the following dependencies from the package repository:
* `git` * `git`
* `gcc` or `llvm` (for clang) (C-compiler) * `gcc` or `llvm` (for clang) (C-compiler)
* `cmake` * `cmake`
* `pkg-config`
* `libusb` * `libusb`
* `gtk+3` or `gtk3` (_optional_, needed for `stlink-gui`) * `gtk+3` or `gtk3` (_optional_, needed for `stlink-gui`)

Wyświetl plik

@ -1,3 +1,20 @@
=== Compilation with pkg-config ===
In order to use pkg-config for development purposes, add the following lines to the toplevel CMakeLists.txt file:
###
# Additional build tasks
###
## Package configuration (pkg-config) on unix-based systems
if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
add_subdirectory(doc/dev/pkg-config) # Option A: external tool pkg-config
find_package(PkgConfig) # Option B: internal cmake module for pkg-config integration
pkg_check_modules(GTK3 gtk+-3.0)
endif ()
ToDo: Check for compatibility issues between options A and B.
=== Target Identification === === Target Identification ===