From 815e01fb80f48c618fcded29ba20442dd3e6b4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ramazan=20Erg=C3=BCder=20Bekrek?= Date: Fri, 5 Feb 2021 22:27:05 +0100 Subject: [PATCH] Changed KWSys references to work with the latest version of KWSys from Kitware's original repo. --- CMakeLists.txt | 2 +- Libs/mbilog/CMakeLists.txt | 2 +- Libs/mbilog/itkDirectory.cxx | 2 +- Libs/mbilog/itkDirectory.h | 4 ++-- Libs/mbilog/itkMultiThreaderBase.cxx | 20 +++++++++---------- Libs/mbilog/itkObjectFactoryBase.cxx | 2 +- .../itkPlatformMultiThreaderWindows.cxx | 2 +- Libs/mbilog/itkThreadPool.cxx | 2 +- Libs/mbilog/target_libraries.cmake | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32005f59da..4f8eb6e342 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -586,7 +586,7 @@ mark_as_superbuild(CTK_BUILD_QTDESIGNER_PLUGINS) # KWSys & VNL from ITK # -add_subdirectory(External/KWSys) +add_subdirectory(External/kwsys) add_subdirectory(External/VNL) #----------------------------------------------------------------------------- diff --git a/Libs/mbilog/CMakeLists.txt b/Libs/mbilog/CMakeLists.txt index 86ed16a76b..9d503a5d5b 100644 --- a/Libs/mbilog/CMakeLists.txt +++ b/Libs/mbilog/CMakeLists.txt @@ -88,4 +88,4 @@ set(KWSYS_HEADER_DIR "${KWSYS_HEADER_ROOT}/${KWSYS_NAMESPACE}") include_directories(${KWSYS_HEADER_ROOT}) ]] -target_link_libraries(${PROJECT_NAME} itksys) \ No newline at end of file +#target_link_libraries(${PROJECT_NAME} itksys) \ No newline at end of file diff --git a/Libs/mbilog/itkDirectory.cxx b/Libs/mbilog/itkDirectory.cxx index 9ed5ae09a1..1aa3447ac4 100644 --- a/Libs/mbilog/itkDirectory.cxx +++ b/Libs/mbilog/itkDirectory.cxx @@ -24,7 +24,7 @@ namespace itk */ Directory::Directory() { - m_Internal = new itksys::Directory; + m_Internal = new kwsys::Directory; } /** diff --git a/Libs/mbilog/itkDirectory.h b/Libs/mbilog/itkDirectory.h index 29efcc4f21..76b859104a 100644 --- a/Libs/mbilog/itkDirectory.h +++ b/Libs/mbilog/itkDirectory.h @@ -19,7 +19,7 @@ #define itkDirectory_h #include "itkObject.h" -#include "itksys/Directory.hxx" +#include "kwsys/Directory.hxx" #include "mbilogExport.h" namespace itk @@ -81,7 +81,7 @@ class MBILOG_EXPORT Directory : public Object PrintSelf(std::ostream & os, Indent indent) const override; private: - ::itksys::Directory * m_Internal; + ::kwsys::Directory * m_Internal; }; // End Class: Directory } // end namespace itk diff --git a/Libs/mbilog/itkMultiThreaderBase.cxx b/Libs/mbilog/itkMultiThreaderBase.cxx index 81a2428761..92b3c3e4fd 100644 --- a/Libs/mbilog/itkMultiThreaderBase.cxx +++ b/Libs/mbilog/itkMultiThreaderBase.cxx @@ -34,8 +34,8 @@ #include "itkNumericTraits.h" #include -#include "itksys/SystemTools.hxx" -#include "itksys/SystemInformation.hxx" +#include "kwsys/SystemTools.hxx" +#include "kwsys/SystemInformation.hxx" #include "itkImageSourceCommon.h" #include "itkSingleton.h" #include "itkProcessObject.h" @@ -140,9 +140,9 @@ MultiThreaderBase::GetGlobalDefaultThreader() { std::string envVar; // first check ITK_GLOBAL_DEFAULT_THREADER - if (itksys::SystemTools::GetEnv("ITK_GLOBAL_DEFAULT_THREADER", envVar)) + if (kwsys::SystemTools::GetEnv("ITK_GLOBAL_DEFAULT_THREADER", envVar)) { - envVar = itksys::SystemTools::UpperCase(envVar); + envVar = kwsys::SystemTools::UpperCase(envVar); ThreaderEnum threaderT = ThreaderTypeFromString(envVar); if (threaderT != ThreaderEnum::Unknown) { @@ -151,9 +151,9 @@ MultiThreaderBase::GetGlobalDefaultThreader() } // if that was not set check ITK_USE_THREADPOOL (deprecated) else if (!m_PimplGlobals->GlobalDefaultThreaderTypeIsInitialized && - itksys::SystemTools::GetEnv("ITK_USE_THREADPOOL", envVar)) + kwsys::SystemTools::GetEnv("ITK_USE_THREADPOOL", envVar)) { - envVar = itksys::SystemTools::UpperCase(envVar); + envVar = kwsys::SystemTools::UpperCase(envVar); itkGenericOutputMacro("Warning: ITK_USE_THREADPOOL \ has been deprecated since ITK v5.0. \ You should now use ITK_GLOBAL_DEFAULT_THREADER\ @@ -182,7 +182,7 @@ You should now use ITK_GLOBAL_DEFAULT_THREADER\ MultiThreaderBase::ThreaderEnum MultiThreaderBase::ThreaderTypeFromString(std::string threaderString) { - threaderString = itksys::SystemTools::UpperCase(threaderString); + threaderString = kwsys::SystemTools::UpperCase(threaderString); if (threaderString == "PLATFORM") { return ThreaderEnum::Platform; @@ -301,7 +301,7 @@ MultiThreaderBase::GetGlobalDefaultNumberOfThreads() */ std::vector ITK_NUMBER_OF_THREADS_ENV_LIST; std::string itkNumberOfThreadsEvnListString = ""; - if (itksys::SystemTools::GetEnv("ITK_NUMBER_OF_THREADS_ENV_LIST", itkNumberOfThreadsEvnListString)) + if (kwsys::SystemTools::GetEnv("ITK_NUMBER_OF_THREADS_ENV_LIST", itkNumberOfThreadsEvnListString)) { // NOTE: We always put "ITK_GLOBAL_DEFAULT_NUMBER_OF_THREADS" at the end // unconditionally. @@ -326,7 +326,7 @@ MultiThreaderBase::GetGlobalDefaultNumberOfThreads() std::string itkGlobalDefaultNumberOfThreadsEnv = "0"; for (const auto & lit : ITK_NUMBER_OF_THREADS_ENV_LIST) { - if (itksys::SystemTools::GetEnv(lit.c_str(), itkGlobalDefaultNumberOfThreadsEnv)) + if (kwsys::SystemTools::GetEnv(lit.c_str(), itkGlobalDefaultNumberOfThreadsEnv)) { threadCount = static_cast(atoi(itkGlobalDefaultNumberOfThreadsEnv.c_str())); } @@ -372,7 +372,7 @@ MultiThreaderBase::GetGlobalDefaultNumberOfThreadsByPlatform() pthread_setconcurrency(num); # endif - itksys::SystemInformation mySys; + kwsys::SystemInformation mySys; mySys.RunCPUCheck(); int result = mySys.GetNumberOfPhysicalCPU(); // Avoid using hyperthreading cores. if (result == -1) diff --git a/Libs/mbilog/itkObjectFactoryBase.cxx b/Libs/mbilog/itkObjectFactoryBase.cxx index 6cbba91a01..f926ce8d84 100644 --- a/Libs/mbilog/itkObjectFactoryBase.cxx +++ b/Libs/mbilog/itkObjectFactoryBase.cxx @@ -396,7 +396,7 @@ inline bool NameIsSharedLibrary(const char * name) { #ifdef ITK_DYNAMIC_LOADING - std::string extension = itksys::DynamicLoader::LibExtension(); + std::string extension = kwsys::DynamicLoader::LibExtension(); std::string sname = name; if (sname.rfind(extension) == sname.size() - extension.size()) diff --git a/Libs/mbilog/itkPlatformMultiThreaderWindows.cxx b/Libs/mbilog/itkPlatformMultiThreaderWindows.cxx index f8228599b0..81570c3efb 100644 --- a/Libs/mbilog/itkPlatformMultiThreaderWindows.cxx +++ b/Libs/mbilog/itkPlatformMultiThreaderWindows.cxx @@ -27,7 +27,7 @@ *=========================================================================*/ #include "itkPlatformMultiThreader.h" #include "itkObjectFactory.h" -#include "itksys/SystemTools.hxx" +#include "kwsys/SystemTools.hxx" #include #include "itkWindows.h" diff --git a/Libs/mbilog/itkThreadPool.cxx b/Libs/mbilog/itkThreadPool.cxx index 7aed2b8f8b..cb82977ffc 100644 --- a/Libs/mbilog/itkThreadPool.cxx +++ b/Libs/mbilog/itkThreadPool.cxx @@ -18,7 +18,7 @@ #include "itkThreadPool.h" -#include "itksys/SystemTools.hxx" +#include "kwsys/SystemTools.hxx" #include "itkThreadSupport.h" #include "itkNumericTraits.h" #include "itkMultiThreaderBase.h" diff --git a/Libs/mbilog/target_libraries.cmake b/Libs/mbilog/target_libraries.cmake index adadbdf92f..e934f35121 100644 --- a/Libs/mbilog/target_libraries.cmake +++ b/Libs/mbilog/target_libraries.cmake @@ -6,7 +6,7 @@ set(target_libraries CTKCore - vnl vcl #ITKKWSys::itksys ITKSYS::itksys + vnl vcl kwsys ) if(CTK_QT_VERSION VERSION_GREATER "4")