WIP. Old changes?

bigladder · Aug 2, 2024 · e94274e · e94274e
1 parent 4807fe1
commit e94274e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/libkiva/CMakeLists.txt b/src/libkiva/CMakeLists.txt
@@ -174,9 +174,10 @@ if (${KIVA_3D})
 endif ()
 
 target_include_directories(libkiva PUBLIC
-        "${libkiva_BINARY_DIR}"
-        "${libkiva_SOURCE_DIR}"
         "${BOOST_SOURCE_DIR}"
+        "${libkiva_SOURCE_DIR}"
+        "${libkiva_BINARY_DIR}"
+        "../include"
         "${kiva_SOURCE_DIR}/vendor/eigen")
 
 target_link_libraries(libkiva PRIVATE kiva_common_interface)

diff --git a/src/libkiva/Foundation.cpp b/src/libkiva/Foundation.cpp
@@ -1,7 +1,7 @@
 /* Copyright (c) 2012-2022 Big Ladder Software LLC. All rights reserved.
  * See the LICENSE file for additional terms and conditions. */
 
-#include "Foundation.hpp"
+#include "<kiva/foundation.h>"
 #include "Errors.hpp"
 
 namespace Kiva {
@@ -108,8 +108,8 @@ Foundation::Foundation()
       reductionLength2{0}, linearAreaMultiplier{0}, isXSymm{false}, isYSymm{false},
       exposedFraction(1.0), useDetailedExposedPerimeter(false), buildingHeight(0.0), hasWall(true),
       hasSlab(true), perimeterSurfaceWidth(0.0), hasPerimeterSurface(false), mesh(Mesh()),
-      numericalScheme(NS_ADI), fADI(0.00001), tolerance(1.0e-6),
-      maxIterations(100000), netArea{0}, netPerimeter{0} {}
+      numericalScheme(NS_ADI), fADI(0.00001), tolerance(1.0e-6), maxIterations(100000), netArea{0},
+      netPerimeter{0} {}
 
 void Foundation::createMeshData() {
   std::size_t nV = polygon.outer().size();