From 657ed1fac3642dca621b8c7b00fbdd93d508ec5f Mon Sep 17 00:00:00 2001
From: YohanPipereau <ypiperea@cisco.com>
Date: Mon, 17 Jun 2019 16:06:44 +0200
Subject: Minor changes to Cmake/Make system

- Verbose mode to run scvpp unit test
- Set scvpp unit test timeout to 60 seconds
- Set cmake required version number to 3.0
- Set libscvpp pkgconfig file version to PROJECT_VERSION Variable used
in CmakeListt

Change-Id: I07c4ecb805a820c78007773f2f3ff68ee5be9cc3
Signed-off-by: YohanPipereau <ypiperea@cisco.com>
---
 Makefile                       | 2 +-
 src/CMakeLists.txt             | 2 +-
 src/plugins/CMakeLists.txt     | 2 +-
 src/scvpp/CMakeLists.txt       | 5 ++++-
 src/scvpp/libscvpp.pc.in       | 2 +-
 src/scvpp/tests/CMakeLists.txt | 2 ++
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 2ebde2d..07261ae 100644
--- a/Makefile
+++ b/Makefile
@@ -253,7 +253,7 @@ build-scvpp:
 	@# NEW INSTRUCTIONS TO BUILD-SCVPP MUST BE DECLARED ON A NEW LINE WITH '@'
 
 test-scvpp: build-scvpp
-	@cd $(BR)/build-scvpp; make test
+	@cd $(BR)/build-scvpp; make test ARGS="-V"
 
 build-plugins:
 	@mkdir -p $(BR)/build-plugins/; cd $(BR)/build-plugins/; \
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ef739e9..617c647 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
 project(sweetcomb)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index ce09682..6a04143 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
 project(sysrepo-vpp-plugins)
 
 # DEPENDENCIES
diff --git a/src/scvpp/CMakeLists.txt b/src/scvpp/CMakeLists.txt
index 8d04085..c0d7087 100644
--- a/src/scvpp/CMakeLists.txt
+++ b/src/scvpp/CMakeLists.txt
@@ -13,9 +13,12 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
+
 project(scvpp)
 
+set(PROJECT_VERSION "19.08")
+
 # COMPILER & LINKER
 ###################
 
diff --git a/src/scvpp/libscvpp.pc.in b/src/scvpp/libscvpp.pc.in
index ce996e3..f11ed75 100644
--- a/src/scvpp/libscvpp.pc.in
+++ b/src/scvpp/libscvpp.pc.in
@@ -4,7 +4,7 @@ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
 
 Name: scvpp
 Description: VPP-Sweetcomb-Sysrepo integration library
-Version: 0.0.1
+Version: @PROJECT_VERSION@
 Libs: -L${libdir} -lscvpp
 Cflags: -I${includedir}
 
diff --git a/src/scvpp/tests/CMakeLists.txt b/src/scvpp/tests/CMakeLists.txt
index 19b7f7b..78e1861 100644
--- a/src/scvpp/tests/CMakeLists.txt
+++ b/src/scvpp/tests/CMakeLists.txt
@@ -30,6 +30,7 @@ add_executable(scvpp_test ${TEST_SRC})
 target_link_libraries(scvpp_test ${CMOCKA_LIBRARIES} scvpp_a)
 target_include_directories(scvpp_test PRIVATE ../inc)
 add_test(scvpp_test ./scvpp_test)
+set_tests_properties(scvpp_test PROPERTIES TIMEOUT 60)
 
 if(valgrind_FOUND)
     add_test(scvpp_valgrind valgrind
@@ -37,4 +38,5 @@ if(valgrind_FOUND)
         --leak-check=full --show-leak-kinds=all
         ./scvpp_test
     )
+    set_tests_properties(scvpp_valgrind PROPERTIES TIMEOUT 60)
 endif(valgrind_FOUND)
-- 
cgit 1.2.3-korg