From 3527a92cdee436b81a80fefd6119a159bb2fbdac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C5=BEenan=20Zuki=C4=87?= Date: Fri, 4 Jan 2019 10:13:40 -0500 Subject: [PATCH] COMP: a fix for system double-conversion build FAILED: Modules/Core/Common/src/CMakeFiles/ITKCommon.dir/itkNumberToString.cxx.obj C:\PROGRA~2\MICROS~1\2017\BUILDT~1\VC\Tools\MSVC\1415~1.267\bin\Hostx64\x64\cl.exe /TP -DITKCommon_EXPORTS -D_CRT_FAR_MAPPINGS_NO_DEPRECATE -D_CRT_IS_WCTYPE_NO_DEPRECATE -D_CRT_MANAGED_FP_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE_GLOBALS -D_CRT_SETERRORMODE_BEEP_SLEEP_NO_DEPRECATE -D_CRT_TIME_FUNCTIONS_NO_DEPRECATE -D_CRT_VCCLRIT_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE -IC:\src\vcpkg\installed\x64-windows\include\double-conversion -IModules\ThirdParty\KWIML\src -IC:\src\vcpkg\buildtrees\itk\ITK\Modules\ThirdParty\KWIML\src -IModules\ThirdParty\KWSys\src -IC:\src\vcpkg\buildtrees\itk\ITK\Modules\ThirdParty\VNL\src\vxl\v3p\netlib -IC:\src\vcpkg\buildtrees\itk\ITK\Modules\ThirdParty\VNL\src\vxl\vcl -IC:\src\vcpkg\buildtrees\itk\ITK\Modules\ThirdParty\VNL\src\vxl\core -IModules\ThirdParty\VNL\src\vxl\v3p\netlib -IModules\ThirdParty\VNL\src\vxl\vcl -IModules\ThirdParty\VNL\src\vxl\core -IC:\src\vcpkg\buildtrees\itk\ITK\Modules\ThirdParty\VNLInstantiation\include -IModules\Core\Common -IC:\src\vcpkg\buildtrees\itk\ITK\Modules\Core\Common\include -IModules\ThirdParty\KWSys\src\KWSys -IC:\src\vcpkg\buildtrees\itk\ITK\Modules\ThirdParty\VNL\src\vxl\core\vnl\algo -IC:\src\vcpkg\buildtrees\itk\ITK\Modules\ThirdParty\VNL\src\vxl\core\vnl /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP -W3 /bigobj /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /showIncludes /FoModules\Core\Common\src\CMakeFiles\ITKCommon.dir\itkNumberToString.cxx.obj /FdModules\Core\Common\src\CMakeFiles\ITKCommon.dir\ /FS -c C:\src\vcpkg\buildtrees\itk\ITK\Modules\Core\Common\src\itkNumberToString.cxx Microsoft (R) C/C++ Optimizing Compiler Version 19.15.26729 for x64 Copyright (C) Microsoft Corporation. All rights reserved. C:\src\vcpkg\installed\x64-windows\include\double-conversion\double-conversion.h(31): fatal error C1083: Cannot open include file: 'double-conversion/utils.h': No such file or directory --- Modules/Core/Common/src/itkNumberToString.cxx | 2 +- Modules/ThirdParty/DoubleConversion/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/Core/Common/src/itkNumberToString.cxx b/Modules/Core/Common/src/itkNumberToString.cxx index 70602338562..abe861df524 100644 --- a/Modules/Core/Common/src/itkNumberToString.cxx +++ b/Modules/Core/Common/src/itkNumberToString.cxx @@ -17,7 +17,7 @@ *=========================================================================*/ #include "itkNumberToString.h" #include "itkNumericTraits.h" -#include "double-conversion.h" +#include "double-conversion/double-conversion.h" #include diff --git a/Modules/ThirdParty/DoubleConversion/CMakeLists.txt b/Modules/ThirdParty/DoubleConversion/CMakeLists.txt index 7075d94c6ff..357b7c26ab0 100644 --- a/Modules/ThirdParty/DoubleConversion/CMakeLists.txt +++ b/Modules/ThirdParty/DoubleConversion/CMakeLists.txt @@ -14,7 +14,7 @@ if(ITK_USE_SYSTEM_DOUBLECONVERSION) if (double-conversion_LIBRARIES AND double-conversion_INCLUDE_DIRS) set(ITKDoubleConversion_SYSTEM_INCLUDE_DIRS - ${double-conversion_INCLUDE_DIRS}) + ${double-conversion_INCLUDE_DIRS}/..) set(ITKDoubleConversion_LIBRARIES "${double-conversion_LIBRARIES}") else() @@ -22,7 +22,7 @@ if(ITK_USE_SYSTEM_DOUBLECONVERSION) endif() else() set(ITKDoubleConversion_INCLUDE_DIRS - ${ITKDoubleConversion_SOURCE_DIR}/src/double-conversion + ${ITKDoubleConversion_SOURCE_DIR}/src ${ITKDoubleConversion_BINARY_DIR}/src/double-conversion) set(ITKDoubleConversion_LIBRARIES itkdouble-conversion) endif()