Browse Source

Merge pull request #1592 from debris/target_platform

fixed #1591, cmake TARGET_PLATFORM
cl-refactor
Marek Kotewicz 10 years ago
parent
commit
16942781ba
  1. 16
      CMakeLists.txt

16
CMakeLists.txt

@ -286,14 +286,11 @@ if ("x${CMAKE_BUILD_TYPE}" STREQUAL "x")
set(CMAKE_BUILD_TYPE "Release")
endif ()
# Default TARGET_PLATFORM to "linux".
set(TARGET_PLATFORM CACHE STRING "linux")
# Default TARGET_PLATFORM to ${CMAKE_SYSTEM}
# change this once we support cross compiling
set(TARGET_PLATFORM CACHE STRING ${CMAKE_SYSTEM})
if ("x${TARGET_PLATFORM}" STREQUAL "x")
if (WIN32)
set(TARGET_PLATFORM "windows")
else ()
set(TARGET_PLATFORM "linux")
endif ()
set(TARGET_PLATFORM ${CMAKE_SYSTEM})
endif ()
include(EthDependencies)
@ -326,10 +323,7 @@ message("-- EVMJIT Build LLVM-based JIT EVM (experimental!) ${EVMJIT}"
message("------------------------------------------------------------------------")
message("")
if ("${TARGET_PLATFORM}" STREQUAL "linux")
set(CMAKE_THREAD_LIBS_INIT pthread)
endif ()
set(CMAKE_THREAD_LIBS_INIT pthread)
include(EthCompilerSettings)
message("-- CXXFLAGS: ${CMAKE_CXX_FLAGS}")

Loading…
Cancel
Save