Merge pull request #4 from oatpp/ci_cmake_version_3_1

ci fix. move cmake version to 3.1
This commit is contained in:
Leonid Stryzhevskyi 2019-01-27 13:26:00 +02:00 committed by GitHub
commit c18095505e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 2 deletions

View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
###################################################################################################
## These variables are passed to oatpp-module-install.cmake script
@ -82,6 +82,10 @@ else()
message("FATAL_ERROR Unknown location to find oatpp '${OATPP_MODULES_LOCATION}'")
endif()
if(OATPP_DIR_LIB)
link_directories(${OATPP_DIR_LIB})
endif()
###################################################################################################
## get dependencies

View File

@ -4,6 +4,27 @@
# https://aka.ms/yaml
jobs:
- job: ubuntu_16_04
displayName: 'Build - Ubuntu 16.04'
continueOnError: false
pool:
vmImage: 'Ubuntu 16.04'
workspace:
clean: all
steps:
- script: |
mkdir build
- task: CMake@1
- script: |
cmake -DOATPP_MODULES_LOCATION=EXTERNAL ..
make
displayName: 'CMake'
workingDirectory: build
- script: |
make test ARGS="-V"
displayName: 'Test'
workingDirectory: build
- job: macOS
displayName: 'Build - macOS-10.13'
continueOnError: false

View File

@ -14,7 +14,7 @@ macro(target_link_oatpp target)
message("target_link_oatpp(${target}) to found in provided path oatpp lib")
target_include_directories(${target} PUBLIC $<BUILD_INTERFACE:${OATPP_DIR_SRC}>)
target_link_directories(${target} PRIVATE ${OATPP_DIR_LIB})
#target_link_directories(${target} PRIVATE ${OATPP_DIR_LIB})
target_link_libraries(${target}
PRIVATE oatpp
PRIVATE oatpp-test