CI: Remove redundant BUILD_SHARED_LIBS=ON

This commit is contained in:
Paweł Bylica 2019-03-14 18:02:41 +01:00
parent 89fcb6f37b
commit c0615047a3
No known key found for this signature in database
GPG Key ID: 7A0C037434FE77EF
3 changed files with 4 additions and 7 deletions

View File

@ -24,7 +24,7 @@ before_build:
if ($env:GENERATOR) { if ($env:GENERATOR) {
if (!(test-path build)) { mkdir build } if (!(test-path build)) { mkdir build }
cd build cd build
cmake -Wno-dev -G "$env:GENERATOR" .. -DBUILD_SHARED_LIBS=ON -DEVMC_TESTING=ON -DCMAKE_INSTALL_PREFIX=C:\install cmake -Wno-dev -G "$env:GENERATOR" .. -DEVMC_TESTING=ON -DCMAKE_INSTALL_PREFIX=C:\install
} }
build_script: build_script:

View File

@ -35,7 +35,7 @@ jobs:
- run: - run:
name: "Configure" name: "Configure"
working_directory: ~/build working_directory: ~/build
command: cmake ../project -DCMAKE_INSTALL_PREFIX=~/install -DBUILD_SHARED_LIBS=ON -DEVMC_TESTING=ON $CMAKE_OPTIONS command: cmake ../project -DCMAKE_INSTALL_PREFIX=~/install -DEVMC_TESTING=ON $CMAKE_OPTIONS
- run: - run:
name: "Build" name: "Build"
command: cmake --build ~/build command: cmake --build ~/build

View File

@ -1,6 +1,6 @@
# EVMC: Ethereum Client-VM Connector API. # EVMC: Ethereum Client-VM Connector API.
# Copyright 2018 The EVMC Authors. # Copyright 2019 The EVMC Authors.
# Licensed under the Apache License, Version 2.0. See the LICENSE file. # Licensed under the Apache License, Version 2.0.
add_library( add_library(
instructions STATIC instructions STATIC
@ -12,8 +12,5 @@ add_library(
add_library(evmc::instructions ALIAS instructions) add_library(evmc::instructions ALIAS instructions)
set_target_properties(instructions PROPERTIES OUTPUT_NAME evmc-instructions) set_target_properties(instructions PROPERTIES OUTPUT_NAME evmc-instructions)
target_include_directories(instructions PUBLIC $<BUILD_INTERFACE:${include_dir}>$<INSTALL_INTERFACE:include>) target_include_directories(instructions PUBLIC $<BUILD_INTERFACE:${include_dir}>$<INSTALL_INTERFACE:include>)
if(BUILD_SHARED_LIBS)
set_target_properties(instructions PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
endif()
install(TARGETS instructions EXPORT evmcTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS instructions EXPORT evmcTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})