From 1abbb43f839e7ea22f56f04ef9b191a951e7a5aa Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Mon, 10 Feb 2014 14:58:23 +0000 Subject: [PATCH] CMake build fixes. --- CMakeLists.txt | 7 ++++++- alethzero/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c58e57e5..b9a9941a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,12 @@ else () endif () set(TARGET_PLATFORM CACHE STRING "linux") -if (${TARGET_PLATFORM} STREQUAL "w64") + +if ("x${TARGET_PLATFORM}" STREQUAL "x") + set(TARGET_PLATFORM "linux") +endif () + +if ("${TARGET_PLATFORM}" STREQUAL "w64") set(CMAKE_SYSTEM_NAME Windows) set(CMAKE_CXX_LIBRARY_ARCHITECTURE x86_64-w64-mingw32) diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt index 30a3f6941..a8a12d312 100644 --- a/alethzero/CMakeLists.txt +++ b/alethzero/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_policy(SET CMP0015 NEW) -cmake_policy(SET CMP0020 NEW) +#cmake_policy(SET CMP0020 NEW) set(CMAKE_INCLUDE_CURRENT_DIR ON) aux_source_directory(. SRC_LIST)