Skip to content

Commit 565b7bf

Browse files
committed
Using develop branch of comms_champion and commsdsl.
1 parent 7c68f0b commit 565b7bf

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
build*
22
.vscode
3-
3+
externals

CMakeLists.txt

+18-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
cmake_minimum_required (VERSION 3.5)
22
project ("cc.mqttsn.commsdsl")
33

4+
option (MQTTSN_NO_WARN_AS_ERR "Don't treat compilation warnings as errors." OFF)
5+
46
# Additional variables to be used if needed
57
# ---------------------------
68
# OUTPUT_DIR - Path to output directory. If not provided <build_dir>/output one is used.
@@ -14,20 +16,26 @@ project ("cc.mqttsn.commsdsl")
1416
# is not provided and examples are not disabled.
1517

1618
if ("${COMMSDSL_TAG}" STREQUAL "")
17-
set(COMMSDSL_TAG "v3.4.2")
19+
set(COMMSDSL_TAG "develop")
1820
endif ()
1921

2022
if ("${COMMS_TAG}" STREQUAL "")
21-
set(COMMS_TAG "v2.4.1")
23+
set(COMMS_TAG "develop")
2224
endif ()
2325

24-
set (VERSION "0.17.1")
26+
set (VERSION "0.18")
27+
28+
set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals")
2529

2630
set (COMMSDSL_TGT "commsdsl_tgt")
2731
if ("${COMMSDSL2COMMS}" STREQUAL "")
32+
execute_process (
33+
COMMAND ${CMAKE_COMMAND} -E make_directory "${EXTERNALS_DIR}"
34+
)
35+
2836
include(ExternalProject)
29-
set (commsdsl2comms_main_dir "${CMAKE_BINARY_DIR}/commsdsl")
30-
set (commsdsl2comms_src_dir "${commsdsl2comms_main_dir}/src")
37+
set (commsdsl2comms_main_dir "${PROJECT_BINARY_DIR}/commsdsl")
38+
set (commsdsl2comms_src_dir "${EXTERNALS_DIR}/commsdsl")
3139
set (commsdsl2comms_bin_dir "${commsdsl2comms_main_dir}/build")
3240
set (commsdsl2comms_install_dir "${commsdsl2comms_main_dir}/install")
3341

@@ -78,6 +86,11 @@ if (TARGET ${COMMSDSL_TGT})
7886
set (extra_dep ${COMMSDSL_TGT})
7987
endif ()
8088

89+
set (warn_as_error "--warn-as-err")
90+
if (MQTTSN_NO_WARN_AS_ERR)
91+
set (warn_as_error)
92+
endif ()
93+
8194
add_custom_target(rm_tmp_tgt
8295
COMMAND ${CMAKE_COMMAND} -E remove_directory ${tmp_dir}
8396
)

0 commit comments

Comments
 (0)