From 738d6cc8dc5f37150ddf6b17dd97bd975ab1bfca Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 20 Sep 2012 08:33:42 +0200 Subject: [PATCH] Use CMAKE_CL_64 to check if we are compiling Windows x64 p4#: 18835 --- ApplicationCode/CMakeLists.txt | 12 ++++++------ .../FileInterface_UnitTests/CMakeLists.txt | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index a69f4095c8..b45d71465d 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -32,13 +32,13 @@ include_directories( # variable you can point to a different ERT distribution. if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert") + set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - if (${CMAKE_SIZEOF_VOID_P} MATCHES "8" ) - set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows-x64") - else() - set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows") - endif() + if (CMAKE_CL_64) + set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows-x64") + else() + set(ERT_ROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/Ert-windows") + endif() endif() diff --git a/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt b/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt index 4a35df4371..72621cc669 100644 --- a/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt +++ b/ApplicationCode/FileInterface/FileInterface_UnitTests/CMakeLists.txt @@ -27,13 +27,13 @@ include_directories( #----------------------------------------------------------------- # Ert configuration if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") - set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert") + set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert") elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") - if (${CMAKE_SIZEOF_VOID_P} MATCHES "8" ) - set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert-windows-x64") - else() - set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert-windows") - endif() + if (CMAKE_CL_64) + set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert-windows-x64") + else() + set(ERT_ROOT_PATH "${ResInsight_SOURCE_DIR}/ThirdParty/Ert-windows") + endif() endif() set( ERT_ECL_PREFIX "ecl" CACHE STRING "Prefix path to use for ecl code in ert")