diff --git a/CMakeLists.txt b/CMakeLists.txt index d2be523bf..6ed84bd3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,11 @@ endif () ### # Shared library ### +if (NOT WIN32) +set(STLINK_LIB_SHARED ${PROJECT_NAME}) +else () set(STLINK_LIB_SHARED ${PROJECT_NAME}-shared) +endif() add_library(${STLINK_LIB_SHARED} SHARED ${STLINK_HEADERS} # header files for ide projects generated by cmake diff --git a/README.md b/README.md index 6e23356af..bdb2351a6 100644 --- a/README.md +++ b/README.md @@ -232,5 +232,5 @@ Issue related to this bug: [#545](https://github.com/texane/stlink/issues/545) ## License -The stlink library and tools are licensed under the [BSD license](LICENSE). With -some exceptions on external components (e.g flashloaders). +The stlink library and tools are licensed under the [BSD license](LICENSE). +The flashloaders/stm32l0x.s and flashloaders/stm32lx.s source files are licensed under the GPL-2+. diff --git a/debian/changelog b/debian/changelog index 0f3edb222..ac18fd872 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,62 @@ +stlink (1.5.0) unstable; urgency=medium + + [ Jerry Jacobs ] + * README.md: Update version badge to v1.4.0 + + [ Viallard Anthony ] + * Add support of STM32L496xx/4A6xx devices (#615) + + [ rdlim ] + * Fix verification of flash error for STM32L496x device (#617) (#618) + + [ dflogeras ] + * Add note about availability in Gentoo package manager (#622) + + [ yaofei zheng ] + * update debian package version (#630) + + [ Lyle Cheatham ] + * Minor formatting fix in FAQ section of README.md (#631) + + [ Vasiliy Glazov ] + * README.md: Added information about Fedora and RedHat/CentOS packages. + (#635) + * Added LIB_INSTALL_DIR to correct libs install on 64-bit systems (#636) + + [ Gwenhael Goavec-Merou ] + * fix write for microcontroler with RAM size less or equal to 32K (#637) + + [ Mateusz Krawiec ] + * Fix memory map for stm32l496xx boards. (#639) + + [ Rüdiger Fortanier ] + * Add unknown chip output (#641) + + [ Slyshyk Oleksiy ] + * fix __FILE__ base name extraction, #628 (#648) + + [ texane ] + * STM32F72xx73xx support, from bob.feretich@rafresearch.com + + [ Kirill Kolyshkin ] + * debian/triggers: add (to run ldconfig) (#664) + + [ Slyshyk Oleksiy ] + * Try to fix #666 issue (#667) + * Try to fix 666 issue (#668) + + [ Jerry Jacobs ] + * Update ChangeLog.md + * Update README.md + + [ texane ] + * STM32F042K6 Nucleo-32 Board reported to work, by frank@bauernoeppel.de + + [ Anatol Pomozov ] + * Update .version file to match release number (#670) + + -- Anatol Pomozov Mon, 19 Feb 2018 11:00:29 -0800 + libstlink (1.4.0) unstable; urgency=low * Major changes and added features diff --git a/debian/control b/debian/control index 41c8e87a3..e33fc757c 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ -Source: libstlink +Source: stlink Priority: optional Maintainer: Andrew 'Necromant' Andrianov Build-Depends: debhelper (>= 9), cmake, libusb-1.0-0-dev, libgtk-3-dev -Standards-Version: 3.9.5 -Section: libs +Standards-Version: 4.1.3 +Section: electronics Homepage: https://github.com/texane/stlink Vcs-Git: https://github.com/texane/stlink.git Vcs-Browser: https://github.com/texane/stlink @@ -11,24 +11,43 @@ Vcs-Browser: https://github.com/texane/stlink Package: libstlink-dev Section: libdevel Architecture: any -Depends: libstlink (= ${binary:Version}), ${misc:Depends} -Description: OpenSource ST-Link tools replacement. Development headers. - This package contains development headers for libstlink. +Depends: libstlink1 (= ${binary:Version}), ${misc:Depends} +Description: OpenSource ST-Link tools replacement. + Flashing tools for STMicroelectronics STM32VL and STM32L. The transport layers + STLINKv1 and STLINKv2 are supported. + . + This package contains the development files for stlink. -Package: libstlink +Package: libstlink1 +Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: OpenSource ST-Link tools replacement. Shared library. - This package libstlink shared library. +Breaks: libstlink +Replaces: libstlink +Description: OpenSource ST-Link tools replacement. + Flashing tools for STMicroelectronics STM32VL and STM32L. The transport layers + STLINKv1 and STLINKv2 are supported. + . + This package contains the shared library for stlink. Package: stlink-tools -Section: libdevel Architecture: any -Depends: libstlink (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: OpenSource ST-Link tools replacement. Commandline Utilities. +Depends: libstlink1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Breaks: libstlink +Replaces: libstlink +Description: OpenSource ST-Link tools replacement. + Flashing tools for STMicroelectronics STM32VL and STM32L. The transport layers + STLINKv1 and STLINKv2 are supported. + . + This package contains commandline utilities for stlink, and modprobe and + udev rules. Package: stlink-gui -Section: libdevel Architecture: any -Depends: libstlink (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: OpenSource ST-Link tools replacement. GUI Tool. +Depends: libstlink1 (= ${binary:Version}), stlink-tools (= ${binary:Version}), + ${shlibs:Depends}, ${misc:Depends} +Description: OpenSource ST-Link tools replacement. + Flashing tools for STMicroelectronics STM32VL and STM32L. The transport layers + STLINKv1 and STLINKv2 are supported. + . + This package contains a GUI tool for stlink. diff --git a/debian/copyright b/debian/copyright index e28d7e1bb..941a4a011 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,12 +1,174 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: libstlink +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: stlink Upstream-Contact: Andrew 'Necromant' Andrianov Source: https://github.com/texane/stlink Files: * -Copyright: (c) 2011 The stlink project (github.com/texane/stlink) contributors. +Copyright: 2011-2018 agpanarin + 2011-2018 Alexey Cherevatenko + 2011-2018 Anatoli + 2011-2018 Andrea Mucignat + 2011-2018 Andrew 'Necromant' Andrianov + 2011-2018 Andrey Yurovsky + 2011-2018 Andy Isaacson + 2011-2018 Áron RADICS + 2011-2018 A Sheaff + 2011-2018 Björn Hauffe + 2011-2018 bob + 2011-2018 Breton M. Saunders + 2011-2018 Bruno Dal Bo + 2011-2018 Burns + 2011-2018 Chris Dew + 2011-2018 Chris Hiszpanski + 2011-2018 Chris Li + 2011-2018 Chris Samuelson + 2011-2018 Christophe Levantis + 2011-2018 Craig Lilley + 2011-2018 dandev37 + 2011-2018 Dan Hepler + 2011-2018 Daniel Campoverde [alx741] + 2011-2018 Daniel O'Connor + 2011-2018 Dave Flogeras + 2011-2018 Dave Murphy + 2011-2018 Dave Vandervies + 2011-2018 Denis Fokin + 2011-2018 Denis Osterland + 2011-2018 Dmitry Bravikov + 2011-2018 Efe Can İçöz + 2011-2018 Ethan Zonca + 2011-2018 Fabien Chouteau + 2011-2018 Fabien Le Mentec + 2011-2018 fhars + 2011-2018 Friedrich Beckmann + 2011-2018 Geoffrey Brown + 2011-2018 George Talusan + 2011-2018 Georg von Zengen + 2011-2018 giuseppe barba + 2011-2018 Greg Alexander + 2011-2018 Greg Meiste + 2011-2018 Hakkavélin + 2011-2018 htk + 2011-2018 Ian Griffiths <6thimage@gmail.com> + 2011-2018 Jack Peel + 2011-2018 Jakub Tyszkowski + 2011-2018 Jan Sarenik + 2011-2018 Jean-Luc Béchennec + 2011-2018 Jean-Marie Lemetayer + 2011-2018 Jeff Kent + 2011-2018 Jeffrey Nelson + 2011-2018 Jens Hoffmann + 2011-2018 Jerome Lambourg + 2011-2018 Jerry Jacobs + 2011-2018 Jim Paris + 2011-2018 Jiří Netolický + 2011-2018 jnosky + 2011-2018 jnosky + 2011-2018 JohannesTaelman + 2011-2018 Jonas Danielsson + 2011-2018 Jonas Norling + 2011-2018 Josh Bialkowski + 2011-2018 Karl Palsson + 2011-2018 kevin + 2011-2018 Kyle Manna + 2011-2018 Lari Lehtomäki + 2011-2018 le mentec fabien + 2011-2018 Martin Nowak + 2011-2018 Matteo Collina + 2011-2018 Max Chen + 2011-2018 Maxime Coquelin + 2011-2018 Maxime Vincent + 2011-2018 Michael Pratt + 2011-2018 Michael Sparmann + 2011-2018 Mike Szczys + 2011-2018 mlundinse + 2011-2018 mux + 2011-2018 Ned Konz + 2011-2018 Nic McDonald + 2011-2018 Nicolas Schodet + 2011-2018 Nikolay + 2011-2018 nullsub + 2011-2018 Olivier Croquette + 2011-2018 Olivier Gay + 2011-2018 Onno Kortmann + 2011-2018 orangeudav + 2011-2018 Pavel Kirienko + 2011-2018 Pekka Nikander + 2011-2018 Pete + 2011-2018 Peter Zotov + 2011-2018 Petteri Aimonen + 2011-2018 Piotr Haber + 2011-2018 Rene Hopf + 2011-2018 Robin Kreis + 2011-2018 Rob Spanton + 2011-2018 Rytis Karpuska + 2011-2018 Sean Simmons + 2011-2018 Sergey Alirzaev + 2011-2018 Simon Wright + 2011-2018 Stany MARCEL + 2011-2018 Stefan Misik + 2011-2018 Sven Wegener + 2011-2018 Tectu + 2011-2018 tekaikko + 2011-2018 texane + 2011-2018 Theodore A. Roth + 2011-2018 Thomas Gärtner + 2011-2018 Tobias Badertscher + 2011-2018 Tom de Boer + 2011-2018 Tristan Gingold + 2011-2018 Uli Köhler + 2011-2018 Uwe Bonnes + 2011-2018 Vadim Kaushan + 2011-2018 Vegard Storheil Eriksen + 2011-2018 Viacheslav Dobromyslov + 2011-2018 Victor Mayoral Vilches + 2011-2018 Wojciech A. Koszek + 2011-2018 Woodrow Douglass + 2011-2018 The "Capt'ns Missing Link" Authors. License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name of Intel Corporation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: * -Copyright: (c) 2011 The "Capt'ns Missing Link" Authors. All rights reserved. -License: BSD-3-clause +Files: flashloaders/stm32l0x.s + flashloaders/stm32lx.s +Copyright: 2010 Spencer Oliver + 2011 Øyvind Harboe + 2011 Clement Burin des Roziers +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 000000000..418e536e9 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,7 @@ +[buildpackage] +upstream-tag = %(version)s +debian-branch = debian + +[dch] +git-log = --first-parent +customizations = /usr/share/doc/git-buildpackage/examples/wrap_cl.py diff --git a/debian/libstlink-dev.dirs b/debian/libstlink-dev.dirs deleted file mode 100644 index 44188162e..000000000 --- a/debian/libstlink-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include diff --git a/debian/libstlink.dirs b/debian/libstlink.dirs deleted file mode 100644 index 68457717b..000000000 --- a/debian/libstlink.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libstlink.install b/debian/libstlink.install deleted file mode 100644 index 08981406e..000000000 --- a/debian/libstlink.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/lib*.so.* -lib/udev/rules.d/*.rules -etc/modprobe.d/*.conf diff --git a/debian/libstlink1.install b/debian/libstlink1.install new file mode 100644 index 000000000..3ddde5841 --- /dev/null +++ b/debian/libstlink1.install @@ -0,0 +1 @@ +usr/lib/*/lib*.so.* diff --git a/debian/libstlink1.symbols b/debian/libstlink1.symbols new file mode 100644 index 000000000..51fa9bdb1 --- /dev/null +++ b/debian/libstlink1.symbols @@ -0,0 +1,125 @@ +libstlink.so.1 libstlink1 #MINVER# + _parse_version@Base 1.5.0 + _stlink_sg_close@Base 1.5.0 + _stlink_sg_core_id@Base 1.5.0 + _stlink_sg_current_mode@Base 1.5.0 + _stlink_sg_enter_jtag_mode@Base 1.5.0 + _stlink_sg_enter_swd_mode@Base 1.5.0 + _stlink_sg_exit_debug_mode@Base 1.5.0 + _stlink_sg_exit_dfu_mode@Base 1.5.0 + _stlink_sg_force_debug@Base 1.5.0 + _stlink_sg_jtag_reset@Base 1.5.0 + _stlink_sg_read_all_regs@Base 1.5.0 + _stlink_sg_read_debug32@Base 1.5.0 + _stlink_sg_read_mem32@Base 1.5.0 + _stlink_sg_read_reg@Base 1.5.0 + _stlink_sg_reset@Base 1.5.0 + _stlink_sg_run@Base 1.5.0 + _stlink_sg_status@Base 1.5.0 + _stlink_sg_step@Base 1.5.0 + _stlink_sg_version@Base 1.5.0 + _stlink_sg_write_debug32@Base 1.5.0 + _stlink_sg_write_mem32@Base 1.5.0 + _stlink_sg_write_mem8@Base 1.5.0 + _stlink_sg_write_reg@Base 1.5.0 + _stlink_usb_close@Base 1.5.0 + _stlink_usb_core_id@Base 1.5.0 + _stlink_usb_current_mode@Base 1.5.0 + _stlink_usb_enter_swd_mode@Base 1.5.0 + _stlink_usb_exit_debug_mode@Base 1.5.0 + _stlink_usb_exit_dfu_mode@Base 1.5.0 + _stlink_usb_force_debug@Base 1.5.0 + _stlink_usb_jtag_reset@Base 1.5.0 + _stlink_usb_read_all_regs@Base 1.5.0 + _stlink_usb_read_all_unsupported_regs@Base 1.5.0 + _stlink_usb_read_debug32@Base 1.5.0 + _stlink_usb_read_mem32@Base 1.5.0 + _stlink_usb_read_reg@Base 1.5.0 + _stlink_usb_read_unsupported_reg@Base 1.5.0 + _stlink_usb_reset@Base 1.5.0 + _stlink_usb_run@Base 1.5.0 + _stlink_usb_set_swdclk@Base 1.5.0 + _stlink_usb_status@Base 1.5.0 + _stlink_usb_step@Base 1.5.0 + _stlink_usb_target_voltage@Base 1.5.0 + _stlink_usb_version@Base 1.5.0 + _stlink_usb_write_debug32@Base 1.5.0 + _stlink_usb_write_mem32@Base 1.5.0 + _stlink_usb_write_mem8@Base 1.5.0 + _stlink_usb_write_reg@Base 1.5.0 + _stlink_usb_write_unsupported_reg@Base 1.5.0 + calculate_F4_sectornum@Base 1.5.0 + calculate_F7_sectornum@Base 1.5.0 + calculate_L4_page@Base 1.5.0 + is_bigendian@Base 1.5.0 + read_uint16@Base 1.5.0 + read_uint32@Base 1.5.0 + send_recv@Base 1.5.0 + send_usb_data_only@Base 1.5.0 + send_usb_mass_storage_command@Base 1.5.0 + stlink_calculate_pagesize@Base 1.5.0 + stlink_chip_id@Base 1.5.0 + stlink_chipid_get_params@Base 1.5.0 + stlink_close@Base 1.5.0 + stlink_clr_hw_bp@Base 1.5.0 + stlink_core_id@Base 1.5.0 + stlink_core_stat@Base 1.5.0 + stlink_cpu_id@Base 1.5.0 + stlink_current_mode@Base 1.5.0 + stlink_enter_swd_mode@Base 1.5.0 + stlink_erase_flash_mass@Base 1.5.0 + stlink_erase_flash_page@Base 1.5.0 + stlink_exit_debug_mode@Base 1.5.0 + stlink_exit_dfu_mode@Base 1.5.0 + stlink_fcheck_flash@Base 1.5.0 + stlink_flash_loader_init@Base 1.5.0 + stlink_flash_loader_run@Base 1.5.0 + stlink_flash_loader_write_to_sram@Base 1.5.0 + stlink_force_debug@Base 1.5.0 + stlink_fread@Base 1.5.0 + stlink_fwrite_flash@Base 1.5.0 + stlink_fwrite_sram@Base 1.5.0 + stlink_get_erased_pattern@Base 1.5.0 + stlink_is_core_halted@Base 1.5.0 + stlink_jtag_reset@Base 1.5.0 + stlink_load_device_params@Base 1.5.0 + stlink_mwrite_flash@Base 1.5.0 + stlink_mwrite_sram@Base 1.5.0 + stlink_open_usb@Base 1.5.0 + stlink_parse_ihex@Base 1.5.0 + stlink_print_data@Base 1.5.0 + stlink_probe_usb@Base 1.5.0 + stlink_probe_usb_free@Base 1.5.0 + stlink_q@Base 1.5.0 + stlink_read_all_regs@Base 1.5.0 + stlink_read_all_unsupported_regs@Base 1.5.0 + stlink_read_debug32@Base 1.5.0 + stlink_read_mem32@Base 1.5.0 + stlink_read_reg@Base 1.5.0 + stlink_read_unsupported_reg@Base 1.5.0 + stlink_reset@Base 1.5.0 + stlink_run@Base 1.5.0 + stlink_run_at@Base 1.5.0 + stlink_set_hw_bp@Base 1.5.0 + stlink_set_swdclk@Base 1.5.0 + stlink_stat@Base 1.5.0 + stlink_status@Base 1.5.0 + stlink_step@Base 1.5.0 + stlink_target_voltage@Base 1.5.0 + stlink_v1_open@Base 1.5.0 + stlink_v1_open_inner@Base 1.5.0 + stlink_verify_write_flash@Base 1.5.0 + stlink_version@Base 1.5.0 + stlink_write_debug32@Base 1.5.0 + stlink_write_dreg@Base 1.5.0 + stlink_write_flash@Base 1.5.0 + stlink_write_mem32@Base 1.5.0 + stlink_write_mem8@Base 1.5.0 + stlink_write_reg@Base 1.5.0 + stlink_write_unsupported_reg@Base 1.5.0 + stm32l1_write_half_pages@Base 1.5.0 + ugly_init@Base 1.5.0 + ugly_log@Base 1.5.0 + write_buffer_to_sram@Base 1.5.0 + write_uint16@Base 1.5.0 + write_uint32@Base 1.5.0 diff --git a/debian/rules b/debian/rules index 2ff7e59a8..c4e9e2afd 100755 --- a/debian/rules +++ b/debian/rules @@ -8,20 +8,11 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk # see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - -# main packaging script based on dh7 syntax %: dh $@ --buildsystem cmake -# debmake generated override targets -# This is example for Cmake (See http://bugs.debian.org/641051 ) override_dh_auto_configure: dh_auto_configure -- \ -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) \ diff --git a/debian/stlink-gui.dirs b/debian/stlink-gui.dirs deleted file mode 100644 index d080ed407..000000000 --- a/debian/stlink-gui.dirs +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin -/usr/share/ diff --git a/debian/stlink-tools.dirs b/debian/stlink-tools.dirs deleted file mode 100644 index 377c76613..000000000 --- a/debian/stlink-tools.dirs +++ /dev/null @@ -1,2 +0,0 @@ -/usr/bin - diff --git a/debian/stlink-tools.install b/debian/stlink-tools.install index 4fa1125bf..ca875a0e6 100644 --- a/debian/stlink-tools.install +++ b/debian/stlink-tools.install @@ -1 +1,3 @@ /usr/bin/st-* +lib/udev/rules.d/*.rules +etc/modprobe.d/*.conf diff --git a/debian/triggers b/debian/triggers deleted file mode 100644 index dd8660367..000000000 --- a/debian/triggers +++ /dev/null @@ -1 +0,0 @@ -activate-noawait ldconfig diff --git a/debian/watch b/debian/watch new file mode 100644 index 000000000..cc653ca9f --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/-$1\.tar\.gz/ \ + https://github.com/texane/stlink/tags .*/v?(\d\S+)\.tar\.gz diff --git a/usr/lib/pkgconfig/CMakeLists.txt b/usr/lib/pkgconfig/CMakeLists.txt index 1d7bcd1dc..a656ff623 100644 --- a/usr/lib/pkgconfig/CMakeLists.txt +++ b/usr/lib/pkgconfig/CMakeLists.txt @@ -1,5 +1,5 @@ set(PKG_CONFIG_LIBDIR "\${prefix}/lib/\${deb_host_multiarch}") -set(PKG_CONFIG_INCLUDEDIR "\${prefix}/include/\${deb_host_multiarch}/${PROJECT_NAME}-${PROJECT_VERSION}") +set(PKG_CONFIG_INCLUDEDIR "\${prefix}/include/\${deb_host_multiarch}/${PROJECT_NAME}") set(PKG_CONFIG_LIBS "-L\${libdir} -l:libstlink.so.${PROJECT_VERSION_MAJOR}") set(PKG_CONFIG_CFLAGS "-I\${includedir}") set(PKG_CONFIG_REQUIRES "libusb-1.0")