Gabriele Contini
2019-11-30 b7f07b2f55c05fc3603feb1cd7c4814d648f11d4
fix centos tests
5个文件已修改
1 文件已重命名
18 ■■■■■ 已修改文件
.travis.yml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CMakeLists.txt 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
scripts/windows_download_boost.bat 补丁 | 查看 | 原始文档 | blame | 历史
src/library/os/CMakeLists.txt 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
test/CMakeLists.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
test/functional/generate-license.cpp 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.travis.yml
@@ -84,6 +84,9 @@
   - os: linux
     dist: bionic
     name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
     env:
        - CTEST_OUTPUT_ON_FAILURE=1
        - WINEARCH=win64
     addons:
        apt:
          packages:
@@ -107,14 +110,14 @@
   - os: windows
     name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MD)"
     before_script:
         - travis_wait 40 ./windows_download_boost.bat
         - travis_wait 40 ./scripts/windows_download_boost.bat
         - cd "${TRAVIS_BUILD_DIR}/build"
         - cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost" ..
   - os: windows
     name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MT)"
     before_script:
         - travis_wait 40 ./windows_download_boost.bat
         - travis_wait 40 ./scripts/windows_download_boost.bat
         - cd "${TRAVIS_BUILD_DIR}"
         - cd build && cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost" -DSTATIC_RUNTIME=1 ..
          
@@ -147,7 +150,6 @@
         
env:
    - CTEST_OUTPUT_ON_FAILURE=1      
before_script:
    - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
CMakeLists.txt
@@ -119,6 +119,7 @@
message( STATUS "Project name      : " ${LCC_PROJECT_NAME} )
message( STATUS "Project base dir  : " ${LCC_PROJECTS_BASE_DIR}/${LCC_PROJECT_NAME} )
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
add_subdirectory(src)
#boost is required only for tests
@@ -133,7 +134,7 @@
        message(STATUS "Compiler architecture: ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}")
endif()
SET( Boost_USE_STATIC_LIBS ON )
find_package(Boost REQUIRED COMPONENTS unit_test_framework system filesystem)
find_package(Boost COMPONENTS unit_test_framework system filesystem)
#if boost is found enable tests
IF(Boost_FOUND)
@@ -146,6 +147,3 @@
ELSE(Boost_FOUND)
    message(WARNING "Boost not found, disabling tests")
ENDIF(Boost_FOUND)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
scripts/windows_download_boost.bat
src/library/os/CMakeLists.txt
@@ -26,6 +26,4 @@
    )
ENDIF(UNIX)
install(TARGETS os ARCHIVE DESTINATION lib/${PROJECT_NAME}/${LCC_PROJECT_NAME})
test/CMakeLists.txt
@@ -9,7 +9,6 @@
    "${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp"
)
cmake_policy(SET CMP0070 NEW)
file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/include/$<CONFIG>/licensecc_properties_test.h" 
        INPUT "${CMAKE_BINARY_DIR}/licensecc_properties_test.h.tmp")
test/functional/generate-license.cpp
@@ -8,6 +8,7 @@
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
#include <sstream>
#include <fstream>
#include <iostream>
#include <licensecc_properties_test.h>