diff options
| author |   YohanPipereau <ypiperea@cisco.com> | 2019-06-17 16:06:44 +0200 |
|---|---|---|
| committer | YohanPipereau <ypiperea@cisco.com> | 2019-06-18 12:04:34 +0200 |
| commit | 657ed1fac3642dca621b8c7b00fbdd93d508ec5f (patch) | |
| tree | d9e51a1072696b44a228e57ce4342d19b5650e4f /src/scvpp | |
| parent | b7b52e85c1b05a456119c11b9cf8e79d660194cc (diff) | |
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>
Diffstat (limited to 'src/scvpp')
| -rw-r--r-- | src/scvpp/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/scvpp/libscvpp.pc.in | 2 | ||||
| -rw-r--r-- | src/scvpp/tests/CMakeLists.txt | 2 |
3 files changed, 7 insertions, 2 deletions
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) |