From: Jerry Jacobs <jerry.jacobs@dualinventive.com>
Date: Thu, 7 Apr 2016 11:01:32 +0000 (+0200)
Subject: Merge with master
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d9814ffe9a37301cd0bb0a74f7fe5e5308dd07e9;p=fw%2Fstlink

Merge with master
---

d9814ffe9a37301cd0bb0a74f7fe5e5308dd07e9
diff --cc CMakeLists.txt
index cae6bd1,e00d1ed..0c9e75e
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,7 -1,6 +1,7 @@@
- cmake_minimum_required(VERSION 2.8.11)
 +project(stlink C)
+ cmake_minimum_required(VERSION 2.8.7)
 -project(stlink)
  
 +include(CheckCCompilerFlag)
  find_package(PkgConfig)
  
  pkg_check_modules(libusb REQUIRED libusb-1.0)
diff --cc README
index 1f9d33c,986de70..d85fda7
--- a/README
+++ b/README
@@@ -43,9 -51,18 +51,18 @@@ following steps will build the project 
  $ ./autogen.sh
  $ ./configure
  $ make
+ ```
+ 
+ ### CMake
+ 
+ ```
+ $ mkdir build && cd build
 -$ cmake ..
++$ cmake -DCMAKE_BUILD_TYPE=Debug ..
+ $ make
+ ```
+ 
+ ## Using the gdb server
  
- USING THE GDBSERVER
- ~~~~~~~~~~~~~~~~~~~
  To run the gdb server: (you do not need sudo if you have set up
  permissions correctly)