From a8e50be781cd907bac86057d6f0091373f0190c4 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 23 Dec 2022 16:19:39 +0100 Subject: [PATCH] Refactoring: Move asserthandler header to include --- code/CMakeLists.txt | 2 +- code/Common/AssertHandler.cpp | 2 +- {code/Common => include/assimp}/AssertHandler.h | 0 test/unit/Common/utAssertHandler.cpp | 2 +- test/unit/Common/utBaseProcess.cpp | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename {code/Common => include/assimp}/AssertHandler.h (100%) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index b87bc665f..8f26d2daf 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -1,6 +1,5 @@ # Open Asset Import Library (assimp) # ---------------------------------------------------------------------- -# # Copyright (c) 2006-2022, assimp team # # All rights reserved. @@ -94,6 +93,7 @@ SET( PUBLIC_HEADERS ${HEADER_PATH}/vector3.inl ${HEADER_PATH}/version.h ${HEADER_PATH}/cimport.h + ${HEADER_PATH}/AssertHandler.h ${HEADER_PATH}/importerdesc.h ${HEADER_PATH}/Importer.hpp ${HEADER_PATH}/DefaultLogger.hpp diff --git a/code/Common/AssertHandler.cpp b/code/Common/AssertHandler.cpp index 469e7bec5..2fd4046ad 100644 --- a/code/Common/AssertHandler.cpp +++ b/code/Common/AssertHandler.cpp @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * @brief Implementation of assert handling logic. */ -#include "AssertHandler.h" +#include #include #include diff --git a/code/Common/AssertHandler.h b/include/assimp/AssertHandler.h similarity index 100% rename from code/Common/AssertHandler.h rename to include/assimp/AssertHandler.h diff --git a/test/unit/Common/utAssertHandler.cpp b/test/unit/Common/utAssertHandler.cpp index a2585fe65..039ba8345 100644 --- a/test/unit/Common/utAssertHandler.cpp +++ b/test/unit/Common/utAssertHandler.cpp @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #include -#include +#include namespace { diff --git a/test/unit/Common/utBaseProcess.cpp b/test/unit/Common/utBaseProcess.cpp index 978af7e99..359042315 100644 --- a/test/unit/Common/utBaseProcess.cpp +++ b/test/unit/Common/utBaseProcess.cpp @@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "UnitTestPCH.h" #include "Common/BaseProcess.h" -#include "Common/AssertHandler.h" +#include using namespace Assimp;