Merge pull request #72 from thewtex/windows-warnings

thewtex · web-flow · commit be680aa1f3e4 · 2019-03-12T23:51:13.000-04:00
Windows warnings
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -64,4 +64,7 @@ set( PerformanceBenchmarking_SRCS
     PerformanceBenchmarkingUtilities.cxx
     ${CMAKE_BINARY_DIR}/PerformanceBenchmarkingInformation.h)
 
+if(MSVC)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
 itk_module_add_library(PerformanceBenchmarking ${PerformanceBenchmarking_SRCS})
diff --git a/src/PerformanceBenchmarkingUtilities.cxx b/src/PerformanceBenchmarkingUtilities.cxx
@@ -45,7 +45,7 @@ echo ${ITKPERFORMANCEBENCHMARK_AUX_JSON}
  */
 static std::string getEnvJsonMap()
 {
-  char * auxEnvironmentJson  =  getenv( "ITKPERFORMANCEBENCHMARK_AUX_JSON" );
+  const char * auxEnvironmentJson = itksys::SystemTools::GetEnv( "ITKPERFORMANCEBENCHMARK_AUX_JSON" );
   if ( auxEnvironmentJson != nullptr )
   {
     jsonxx::Object auxEnvironmentObject;

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ echo ${ITKPERFORMANCEBENCHMARK_AUX_JSON}`
`45`	`45`	`*/`
`46`	`46`	`static std::string getEnvJsonMap()`
`47`	`47`	`{`
`48`		`- char * auxEnvironmentJson = getenv( "ITKPERFORMANCEBENCHMARK_AUX_JSON" );`
	`48`	`+ const char * auxEnvironmentJson = itksys::SystemTools::GetEnv( "ITKPERFORMANCEBENCHMARK_AUX_JSON" );`
`49`	`49`	`if ( auxEnvironmentJson != nullptr )`
`50`	`50`	`{`
`51`	`51`	`jsonxx::Object auxEnvironmentObject;`