diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-02-01 16:09:39 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-02-01 16:09:39 (GMT) |
| commit | 32409bb8e3ae410e54484c94f899b26235a25092 (patch) | |
| tree | 0986a09f65d4c102c32fb4c7270e354859b17b18 /Source/kwsys | |
| parent | 41ad9d20df1b6d5466459e654f75094c008c9a0b (diff) | |
| download | CMake-32409bb8e3ae410e54484c94f899b26235a25092.zip CMake-32409bb8e3ae410e54484c94f899b26235a25092.tar.gz CMake-32409bb8e3ae410e54484c94f899b26235a25092.tar.bz2 | |
ENH: fix win64 build and a warning
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 2c9baca..9a7160a 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -801,7 +801,7 @@ bool SystemInformationImplementation::DoesCPUSupportCPUID() { int CPUIDPresent = 0; -#if defined(_MSC_VER) && (_MSC_VER >= 1300) +#if USE_ASM_INSTRUCTIONS // Use SEH to determine CPUID presence __try { _asm { @@ -842,7 +842,7 @@ bool SystemInformationImplementation::DoesCPUSupportCPUID() bool SystemInformationImplementation::RetrieveCPUFeatures() { -#if defined(_MSC_VER) && (_MSC_VER >= 1300) +#if USE_ASM_INSTRUCTIONS int localCPUFeatures = 0; int localCPUAdvanced = 0; @@ -2761,7 +2761,7 @@ kwsys_stl::string SystemInformationImplementation::RunProcess(kwsys_stl::vector< } kwsysProcess_WaitForExit(gp, 0); - int result = 1; + int result = 0; switch(kwsysProcess_GetState(gp)) { case kwsysProcess_State_Exited: @@ -2790,7 +2790,10 @@ kwsys_stl::string SystemInformationImplementation::RunProcess(kwsys_stl::vector< } break; } kwsysProcess_Delete(gp); - (void)result; + if(result) + { + kwsys_ios::cerr << "Error " << args[0] << " returned :" << result << "\n"; + } return buffer; } |