From d227f66984d78852afc315474abe6bb900e5675d Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Fri, 1 Feb 2008 11:09:39 -0500
Subject: [PATCH] ENH: fix win64 build and a warning
---
SystemInformation.cxx | 11 +++++++----
kwsysDateStamp.cmake | 4 ++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index e60f2191..fe3795d1 100644
--- a/SystemInformation.cxx
+++ b/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;
}
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 4ad55884..cfe2833b 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -4,7 +4,7 @@
SET(KWSYS_DATE_STAMP_YEAR 2008)
# KWSys version date month component. Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 01)
+SET(KWSYS_DATE_STAMP_MONTH 02)
# KWSys version date day component. Format is DD.
-SET(KWSYS_DATE_STAMP_DAY 31)
+SET(KWSYS_DATE_STAMP_DAY 01)
--
GitLab