Merge pull request #39 from pshriwise/rename-include-dir

Rename internal include location to match install location
pshriwise · Apr 18, 2023 · 52b74f1 · 52b74f1
2 parents 25a681b + 195d613
commit 52b74f1
Show file tree

Hide file tree

Showing 28 changed files with 36 additions and 37 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -87,6 +87,5 @@ jobs:
     # This test is here to check compatibility with DAGMC's develop branch
     # An error here shouldn't cause the build to fail
     - name: DAGMC Build and Test
-      continue-on-error: true
       shell: bash
       run: $GITHUB_WORKSPACE/ci/dagmc-install.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -101,20 +101,20 @@ if(GIT_FOUND)
 endif()
 
 # install headers
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/RTI.hpp" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/primitives.hpp" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/ray.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/MOABRay.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/MOABDirectAccess.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/Vec3da.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/constants.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/sys.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/Vec3fa.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/Vec3ba.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/Vec3.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/embree3.hpp" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/embree4.hpp" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/embree_interface.hpp" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/RTI.hpp" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/primitives.hpp" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/ray.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/MOABRay.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/MOABDirectAccess.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/Vec3da.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/constants.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/sys.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/Vec3fa.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/Vec3ba.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/Vec3.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/embree3.hpp" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/embree4.hpp" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/embree_interface.hpp" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
 
 # Tests
 enable_testing()
@@ -124,8 +124,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/ddConfig.cmake.in" "${CMAKE_CU
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ddConfig.cmake" DESTINATION "${DD_CMAKE_CONFIG_LOCATION}")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/ddConfigVersion.cmake.in" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ddConfigVersion.cmake")
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ddConfigVersion.cmake" DESTINATION "${DD_CMAKE_CONFIG_LOCATION}")
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/version.h")
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double-down/version.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/version.h")
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/double_down/version.h" DESTINATION "${DD_INCLUDE_INSTALL_LOCATION}")
 
 add_subdirectory(docs)
 add_subdirectory(tools)

diff --git a/ci/dagmc-install.sh b/ci/dagmc-install.sh
@@ -3,7 +3,7 @@ set -ex
 
 # DAGMC Variables
 DAGMC_BRANCH='develop'
-DAGMC_REPO='https://github.com/pshriwise/dagmc/'
+DAGMC_REPO='https://github.com/svalinn/dagmc/'
 DAGMC_INSTALL_DIR=$HOME/DAGMC/
 
 CURRENT_DIR=$(pwd)

diff --git a/include/double-down/MOABDirectAccess.h → include/double_down/MOABDirectAccess.h b/include/double-down/MOABDirectAccess.h → include/double_down/MOABDirectAccess.h
diff --git a/include/double-down/MOABRay.h → include/double_down/MOABRay.h b/include/double-down/MOABRay.h → include/double_down/MOABRay.h
@@ -7,7 +7,7 @@
 // Double-down
 #include "ray.h"
 
-#include "double-down/embree_interface.hpp"
+#include "double_down/embree_interface.hpp"
 
 using namespace double_down;
 

diff --git a/include/double-down/RTI.hpp → include/double_down/RTI.hpp b/include/double-down/RTI.hpp → include/double_down/RTI.hpp
diff --git a/include/double-down/Vec3.h → include/double_down/Vec3.h b/include/double-down/Vec3.h → include/double_down/Vec3.h
diff --git a/include/double-down/Vec3ba.h → include/double_down/Vec3ba.h b/include/double-down/Vec3ba.h → include/double_down/Vec3ba.h
diff --git a/include/double-down/Vec3da.h → include/double_down/Vec3da.h b/include/double-down/Vec3da.h → include/double_down/Vec3da.h
diff --git a/include/double-down/Vec3fa.h → include/double_down/Vec3fa.h b/include/double-down/Vec3fa.h → include/double_down/Vec3fa.h
diff --git a/include/double-down/constants.h → include/double_down/constants.h b/include/double-down/constants.h → include/double_down/constants.h
diff --git a/include/double-down/embree3.hpp → include/double_down/embree3.hpp b/include/double-down/embree3.hpp → include/double_down/embree3.hpp
diff --git a/include/double-down/embree4.hpp → include/double_down/embree4.hpp b/include/double-down/embree4.hpp → include/double_down/embree4.hpp
diff --git a/include/double-down/embree_interface.hpp → include/double_down/embree_interface.hpp b/include/double-down/embree_interface.hpp → include/double_down/embree_interface.hpp
@@ -1,11 +1,11 @@
 
 #ifdef EMBREE4
 
-#include "double-down/embree4.hpp"
+#include "double_down/embree4.hpp"
 
 #elif defined(EMBREE3)
 
-#include "double-down/embree3.hpp"
+#include "double_down/embree3.hpp"
 
 #else
 

diff --git a/include/double-down/primitives.hpp → include/double_down/primitives.hpp b/include/double-down/primitives.hpp → include/double_down/primitives.hpp
@@ -14,7 +14,7 @@
 #include "MOABDirectAccess.h"
 
 // Embree
-#include "double-down/embree_interface.hpp"
+#include "double_down/embree_interface.hpp"
 namespace double_down {
 
 /*! Structure with triangle information used in Embree */

diff --git a/include/double-down/ray.h → include/double_down/ray.h b/include/double-down/ray.h → include/double_down/ray.h
@@ -5,7 +5,7 @@
 // Double-down
 #include "Vec3da.h"
 
-#include "double-down/embree_interface.hpp"
+#include "double_down/embree_interface.hpp"
 
 namespace double_down {
 

diff --git a/include/double-down/sys.h → include/double_down/sys.h b/include/double-down/sys.h → include/double_down/sys.h
diff --git a/include/double-down/version.h.in → include/double_down/version.h.in b/include/double-down/version.h.in → include/double_down/version.h.in
diff --git a/src/MOABDirectAccess.cpp b/src/MOABDirectAccess.cpp
@@ -3,7 +3,7 @@
 // MOAB
 #include "moab/Range.hpp"
 
-#include "double-down/MOABDirectAccess.h"
+#include "double_down/MOABDirectAccess.h"
 
 MBDirectAccess::MBDirectAccess(Interface* mbi) : mbi(mbi) { setup(); }
 

diff --git a/src/MOABRay.cpp b/src/MOABRay.cpp
@@ -1,8 +1,8 @@
 
 
-#include "double-down/ray.h"
-#include "double-down/primitives.hpp"
-#include "double-down/MOABRay.h"
+#include "double_down/ray.h"
+#include "double_down/primitives.hpp"
+#include "double_down/MOABRay.h"
 
 bool in_facets(MBRay ray, moab::EntityHandle tri) {
   if (ray.rh) {

diff --git a/src/RTI.cpp b/src/RTI.cpp
@@ -6,8 +6,8 @@
 #include "moab/GeomTopoTool.hpp"
 
 // Double-down
-#include "double-down/RTI.hpp"
-#include "double-down/constants.h"
+#include "double_down/RTI.hpp"
+#include "double_down/constants.h"
 
 namespace double_down {
 

diff --git a/src/primitives.cpp b/src/primitives.cpp
@@ -5,7 +5,7 @@
 #include "moab/GeomUtil.hpp"
 
 // Local
-#include "double-down/primitives.hpp"
+#include "double_down/primitives.hpp"
 
 namespace double_down {
 

diff --git a/test/test_build.cpp b/test/test_build.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include "double-down/RTI.hpp"
+#include "double_down/RTI.hpp"
 #include "test_utils.hpp"
 
 using namespace double_down;

diff --git a/test/test_closest.cpp b/test/test_closest.cpp
@@ -4,7 +4,7 @@
 
 #include "test_utils.hpp"
 
-#include "double-down/RTI.hpp"
+#include "double_down/RTI.hpp"
 
 using namespace double_down;
 

diff --git a/test/test_mb.cpp b/test/test_mb.cpp
@@ -2,7 +2,7 @@
 
 #include <iostream>
 
-#include "double-down/RTI.hpp"
+#include "double_down/RTI.hpp"
 
 #include "test_utils.hpp"
 

diff --git a/test/test_rf.cpp b/test/test_rf.cpp
@@ -4,7 +4,7 @@
 
 #include "test_utils.hpp"
 
-#include "double-down/RTI.hpp"
+#include "double_down/RTI.hpp"
 
 using namespace double_down;
 

diff --git a/tools/closest_to_location.cpp b/tools/closest_to_location.cpp
@@ -5,8 +5,8 @@
 // MOAB
 #include "moab/ProgOptions.hpp"
 
-// double-down
-#include "double-down/RTI.hpp"
+// double_down
+#include "double_down/RTI.hpp"
 
 using namespace double_down;
 

diff --git a/tools/ray_fire.cpp b/tools/ray_fire.cpp
@@ -4,7 +4,7 @@
 #include <ctime>
 
 #include "moab/ProgOptions.hpp"
-#include "double-down/RTI.hpp"
+#include "double_down/RTI.hpp"
 
 using namespace double_down;