Code Review
/
ric-plt
/
lib
/
rmr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
enhance(build): Add deb refernce file for ci/cd
[ric-plt/lib/rmr.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
51639d2
..
dff07ad
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,4
+1,3
@@
-
#
#==================================================================================
# Copyright (c) 2019 Nokia
#
#==================================================================================
# Copyright (c) 2019 Nokia
@@
-23,7
+22,7
@@
cmake_minimum_required( VERSION 3.5 )
set( major_version "1" ) # should be automatically populated from git tag later, but until CI process sets a tag we use this
set( minor_version "0" )
set( major_version "1" ) # should be automatically populated from git tag later, but until CI process sets a tag we use this
set( minor_version "0" )
-set( patch_level "
22
" )
+set( patch_level "
33
" )
set( install_root "${CMAKE_INSTALL_PREFIX}" )
set( install_lib "lib" )
set( install_root "${CMAKE_INSTALL_PREFIX}" )
set( install_lib "lib" )
@@
-84,6
+83,11
@@
add_definitions(
-DPATCH_VER=${patch_level}${spoiled_str}
)
-DPATCH_VER=${patch_level}${spoiled_str}
)
+# create a file with the deb name so that jenkins can extract it
+execute_process(
+ COMMAND bash -c "echo ${CMAKE_CURRENT_BINARY_DIR}/rmr_${major_version}.${minor_version}.${patch_level}.deb >/tmp/rmr_deb_path"
+)
+
# ---------------- setup nano/nng things ---------------------------------------
if( NOT SKIP_EXTERNALS )
# ---------------- setup nano/nng things ---------------------------------------
if( NOT SKIP_EXTERNALS )
@@
-168,9
+172,9
@@
set( CMAKE_POSITION_INDEPENDENT_CODE ON )
set( CMAKE_CXX_FLAGS "-g -Wall " )
# Include modules
set( CMAKE_CXX_FLAGS "-g -Wall " )
# Include modules
-add_subdirectory( src/common )
-add_subdirectory( src/nanomsg )
-add_subdirectory( src/nng )
+add_subdirectory( src/
rmr/
common )
+add_subdirectory( src/
rmr/
nanomsg )
+add_subdirectory( src/
rmr/
nng )
add_subdirectory( doc ) # this will auto skip if {X}fm is not available
add_subdirectory( doc ) # this will auto skip if {X}fm is not available