From 9c81272278fd61dbaa1fce48796964b694a95c8e Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Sat, 13 Sep 2014 14:22:41 +0200 Subject: [PATCH] cmake: oups forget to change the usage of 64BIT_BUILD variable --- cmake/BuildParameters.cmake | 2 +- cmake/SearchForStuff.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index f8f8cdfa37..f2cd947e55 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -78,7 +78,7 @@ if(_ARCH_64) endif() # 64 bits cross-compile specific configuration -if(_ARCH_64 AND 64BIT_BUILD) +if(_ARCH_64 AND 64BIT_BUILD_DONT_WORK) message("Compiling 64bit build on 64bit architecture") # Search library in /usr/lib64 SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON) diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 87e9fccb39..b178ee54ac 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -101,7 +101,7 @@ if(wxWidgets_FOUND) if(Linux) # Force the use of 32 bit library configuration on # 64 bits machine with 32 bits library in /usr/lib32 - if(_ARCH_64 AND NOT 64BIT_BUILD) + if(_ARCH_64 AND NOT 64BIT_BUILD_DONT_WORK) ## There is no guarantee that wx-config is a link to a 32 bits library. So you need to force the destinity # Library can go into 3 path major paths (+ multiarch but you will see that later when implementation is done) # 1/ /usr/lib32 (32 bits only)