diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-01 21:21:28 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-01 21:21:28 (GMT) |
| commit | f9687e328f7ea64ea6384aae11af36fdd3a12643 (patch) | |
| tree | 91e2555b44011705d3188f11d7b7598f29c0ba7b /Source/cmFindCommon.cxx | |
| parent | 3c7354c1cd9fb081df8b3f4faef5160ea83f584f (diff) | |
| download | CMake-f9687e328f7ea64ea6384aae11af36fdd3a12643.zip CMake-f9687e328f7ea64ea6384aae11af36fdd3a12643.tar.gz CMake-f9687e328f7ea64ea6384aae11af36fdd3a12643.tar.bz2 | |
Merge in changes to CMake-2-8 RC 2
Diffstat (limited to 'Source/cmFindCommon.cxx')
| -rw-r--r-- | Source/cmFindCommon.cxx | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx index d051b4c..f4c0064 100644 --- a/Source/cmFindCommon.cxx +++ b/Source/cmFindCommon.cxx @@ -1,19 +1,14 @@ -/*========================================================================= +/*============================================================================ + CMake - Cross Platform Makefile Generator + Copyright 2000-2009 Kitware, Inc., Insight Software Consortium - Program: CMake - Cross-Platform Makefile Generator - Module: $RCSfile$ - Language: C++ - Date: $Date$ - Version: $Revision$ + Distributed under the OSI-approved BSD License (the "License"); + see accompanying file Copyright.txt for details. - Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. - See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. - - This software is distributed WITHOUT ANY WARRANTY; without even - the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the above copyright notices for more information. - -=========================================================================*/ + This software is distributed WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the License for more information. +============================================================================*/ #include "cmFindCommon.h" //---------------------------------------------------------------------------- @@ -329,14 +324,10 @@ void cmFindCommon::AddUserPath(std::string const& p, // it. cmSystemTools::KeyWOW64 view = cmSystemTools::KeyWOW64_32; cmSystemTools::KeyWOW64 other_view = cmSystemTools::KeyWOW64_64; - if(const char* psize = - this->Makefile->GetDefinition("CMAKE_SIZEOF_VOID_P")) + if(this->Makefile->PlatformIs64Bit()) { - if(atoi(psize) == 8) - { - view = cmSystemTools::KeyWOW64_64; - other_view = cmSystemTools::KeyWOW64_32; - } + view = cmSystemTools::KeyWOW64_64; + other_view = cmSystemTools::KeyWOW64_32; } // Expand using the view of the target application. |