From 1534e7962e6bb90e17d4e82b724337f492df17e1 Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Wed, 21 Aug 2024 20:24:17 +0200 Subject: [PATCH] Revert wrongfully applied parts --- cmake/CMakeLists.txt | 2 +- src/examples/IfcAdvancedHouse.cpp | 2 +- src/examples/IfcOpenHouse.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index c451f0cc45..60294c2256 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -221,7 +221,7 @@ endif() if(GLTF_SUPPORT OR CITYJSON_SUPPORT) UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR) - find_path(json_header_path "nlohmann/json.hpp" ${JSON_INCLUDE_DIR}) + find_path(json_header_path "json.hpp" ${JSON_INCLUDE_DIR} PATH_SUFFIXES "nlohmann") set(JSON_INCLUDE_DIR ${json_header_path}) if(json_header_path) diff --git a/src/examples/IfcAdvancedHouse.cpp b/src/examples/IfcAdvancedHouse.cpp index f4623fa7cc..cb1f64975f 100644 --- a/src/examples/IfcAdvancedHouse.cpp +++ b/src/examples/IfcAdvancedHouse.cpp @@ -38,7 +38,7 @@ #include -#define IfcSchema Ifc4 +#define IfcSchema Ifc2x3 #include "../ifcparse/macros.h" #include "../ifcparse/Ifc2x3.h" #include "../ifcparse/IfcBaseClass.h" diff --git a/src/examples/IfcOpenHouse.cpp b/src/examples/IfcOpenHouse.cpp index f7e4a85873..3f6d56236d 100644 --- a/src/examples/IfcOpenHouse.cpp +++ b/src/examples/IfcOpenHouse.cpp @@ -35,7 +35,7 @@ #include -#define IfcSchema Ifc4 +#define IfcSchema Ifc2x3 #include "../ifcparse/macros.h" #include "../ifcparse/Ifc2x3.h" #include "../ifcparse/IfcBaseClass.h"