From e46af93bcc91a1f5660c22ade7c9dedead5a772a Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 30 11月 2019 23:24:58 +0800
Subject: [PATCH] fix centos
---
.travis.yml | 14 +++++++++++++-
CMakeLists.txt | 11 +++--------
test/CMakeLists.txt | 12 +++++++++---
3 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ed056e8..d9b4de2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,13 +61,21 @@
- libboost-system-dev
- libboost-thread-dev
- libboost-date-time-dev
+ - lcov
before_script:
- cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug ..
script:
- cmake --build . --target install
- ctest
- ctest -T memcheck
-
+ after_success:
+ # Create lcov report
+ - lcov --capture --directory . --output-file coverage.info
+ - lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter system-files
+ - lcov --list coverage.info # debug info
+ # Uploading report to CodeCov
+ - bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
+
- os: linux
dist: bionic
name: "CentOS-7 Docker"
@@ -149,6 +157,10 @@
fi
- cd "${TRAVIS_BUILD_DIR}"
- cd build && cmake -G "MinGW Makefiles" -DBOOST_ROOT="C:/local/boost" -DBoost_ARCHITECTURE="-x64" -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID="x64" -DCMAKE_SH="CMAKE_SH-NOTFOUND" ..
+ script:
+ - travis_wait 20 cmake --build . --target install --config Release
+ - ctest -C Release
+
env:
- CTEST_OUTPUT_ON_FAILURE=1
before_script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e24dcfb..882174e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,8 +62,8 @@
SET ( OPENSSL_USE_STATIC_LIBS ON )
find_package(OpenSSL REQUIRED COMPONENTS Crypto)
include_directories(${OPENSSL_INCLUDE_DIR})
- #list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION} ")
+
find_package(Threads)
if(THREADS_HAVE_PTHREAD_ARG)
list(APPEND EXTERNAL_LIBS "-pthread")
@@ -72,12 +72,10 @@
list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}")
endif()
endif(THREADS_HAVE_PTHREAD_ARG)
- #Zlib required when openssl version < 1.0.1f
- #SET ( ZLIB_USE_STATIC_LIBS ON )
- #find_package(ZLIB REQUIRED)
- #MESSAGE(STATUS "Found zlib version ${ZLIB_VERSION} ")
+
find_program( MEMORYCHECK_COMMAND valgrind )
set( MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full" )
+
if(USE_DBUS_IDENTIFIER)
FIND_PACKAGE(Dbus REQUIRED)
add_definitions(-DUSE_DBUS)
@@ -85,9 +83,6 @@
include_directories(${DBUS_ARCH_INCLUDE_DIR})
list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
endif(USE_DBUS_IDENTIFIER)
- #if(NOT MINGW)
- # list(APPEND EXTERNAL_LIBS ${CMAKE_DL_LIBS})
- #endif(NOT MINGW)
endif(UNIX)
#initialize project
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2c02526..d0497af 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,10 +8,16 @@
"${CMAKE_CURRENT_SOURCE_DIR}/../src/templates/licensecc_properties_test.h.in"
"${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp"
)
-
-file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/include/$<CONFIG>/licensecc_properties_test.h"
+IF(CMAKE_VERSION VERSION_GREATER_EQUAL 3.0)
+ file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/include/$<CONFIG>/licensecc_properties_test.h"
INPUT "${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp")
+ include_directories ( ${CMAKE_BINARY_DIR}/include/$<CONFIG> )
+ELSE(CMAKE_VERSION VERSION_GREATER_EQUAL 3.0)
+#patch for Centos 7 cmake 2.8.11 :(
+ file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/include/$<CONFIGURATION>/licensecc_properties_test.h"
+ INPUT "${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp")
+ include_directories ( ${CMAKE_BINARY_DIR}/include/$<CONFIGURATION> )
+endif(CMAKE_VERSION VERSION_GREATER_EQUAL 3.0)
-include_directories ( ${CMAKE_BINARY_DIR}/include/$<CONFIG> )
add_subdirectory(library)
add_subdirectory(functional)
\ No newline at end of file
--
Gitblit v1.9.1