diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2021-07-25 16:30:27 (GMT) |
|---|---|---|
| committer | Riku Isokoski <riksu9000@gmail.com> | 2021-07-25 16:30:27 (GMT) |
| commit | 2e8bc634dcae6e304b8f94e2633644fd55b64450 (patch) | |
| tree | 7098aaa514c1f7600447235e21721319bcb33ae7 /CMakeLists.txt | |
| parent | 12b14176ec965f2553e4cad16e291d54704128f3 (diff) | |
| parent | 7b75ca591d31ccd8883a1a1ff83cfd271959dbaa (diff) | |
Merge branch 'develop' into fit_more_tasks
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f2e467e..b442fc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10) -project(pinetime VERSION 1.2.0 LANGUAGES C CXX ASM) +project(pinetime VERSION 1.3.0 LANGUAGES C CXX ASM) set(CMAKE_C_STANDARD 99) set(CMAKE_CXX_STANDARD 14) @@ -21,10 +21,6 @@ if (NOT NRF5_SDK_PATH) message(FATAL_ERROR "The path to the NRF52 SDK must be specified on the command line (add -DNRF5_SDK_PATH=<path>") endif () -if(NOT USE_JLINK AND NOT USE_GDB_CLIENT AND NOT USE_OPENOCD) - set(USE_JLINK true) -endif() - if(USE_JLINK) if (NOT NRFJPROG) message(FATAL_ERROR "the path to the tool nrfjprog must be specified on the command line (add -DNRFJPROG=<path>") |