diff options
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | libdevcore/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libevmasm/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | liblll/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libsolidity/CMakeLists.txt | 1 |
5 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index d06ef3fe..c476c154 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,13 @@ matrix: # See https://github.com/ethereum/webthree-umbrella/issues/565 - TRAVIS_BUILD_TYPE=Debug - ZIP_SUFFIX=osx-elcapitan + - os: osx + osx_image: xcode8 + env: + # Look like "The Heisenbug" is occurring here too, so we'll do the same workaround. + # See https://travis-ci.org/ethereum/solidity/jobs/150240930 + - TRAVIS_BUILD_TYPE=Debug + - ZIP_SUFFIX=macos-sierra git: depth: 2 diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt index 620b1190..c4f886a6 100644 --- a/libdevcore/CMakeLists.txt +++ b/libdevcore/CMakeLists.txt @@ -12,5 +12,3 @@ add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) eth_use(${EXECUTABLE} REQUIRED Dev::base) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) -install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) - diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt index f86da49c..61162eee 100644 --- a/libevmasm/CMakeLists.txt +++ b/libevmasm/CMakeLists.txt @@ -11,5 +11,3 @@ add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) eth_use(${EXECUTABLE} REQUIRED Jsoncpp Dev::soldevcore) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) -install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) - diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt index 97a1a186..3b63e495 100644 --- a/liblll/CMakeLists.txt +++ b/liblll/CMakeLists.txt @@ -19,5 +19,3 @@ eth_use(${EXECUTABLE} REQUIRED Solidity::evmasm) #target_link_libraries(${EXECUTABLE} evmasm) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) -install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) - diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index 4ca8d6f7..56aea829 100644 --- a/libsolidity/CMakeLists.txt +++ b/libsolidity/CMakeLists.txt @@ -18,5 +18,4 @@ add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) eth_use(${EXECUTABLE} REQUIRED Dev::soldevcore Solidity::evmasm) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) -install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) |