Fix resources path (#212)

* Fix resources path

* More normalization of the settings

Author: doyubkim

src/examples/hybrid_liquid_sim/CMakeLists.txt

@@ -37,7 +37,7 @@ target_compile_options(${target}
 )
 target_compile_definitions(${target}
     PRIVATE
-    RESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../../resources/"
+    RESOURCES_DIR="${RESOURCES_DIR}"
 )
 
 # Link libraries

src/examples/level_set_liquid_sim/CMakeLists.txt

@@ -37,7 +37,7 @@ target_compile_options(${target}
 )
 target_compile_definitions(${target}
     PRIVATE
-    RESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../../resources/"
+    RESOURCES_DIR="${RESOURCES_DIR}"
 )
 
 # Link libraries

src/examples/level_set_liquid_sim/main.cpp

@@ -203,7 +203,7 @@ void runExample3(const std::string& rootDir, size_t resX, int numberOfFrames,
 
     // Build emitters
     auto bunnyMesh = TriangleMesh3::builder().makeShared();
-    std::ifstream objFile(RESOURCES_DIR "bunny.obj");
+    std::ifstream objFile(RESOURCES_DIR "/bunny.obj");
     if (objFile) {
         bunnyMesh->readObj(&objFile);
     } else {
@@ -246,7 +246,7 @@ void runExample4(const std::string& rootDir, size_t resX, int numberOfFrames,
 
     // Build emitters
     auto bunnyMesh = TriangleMesh3::builder().makeShared();
-    std::ifstream objFile(RESOURCES_DIR "bunny.obj");
+    std::ifstream objFile(RESOURCES_DIR "/bunny.obj");
     if (objFile) {
         bunnyMesh->readObj(&objFile);
     } else {

src/examples/smoke_sim/CMakeLists.txt

@@ -37,7 +37,7 @@ target_compile_options(${target}
 )
 target_compile_definitions(${target}
     PRIVATE
-    RESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../../resources/"
+    RESOURCES_DIR="${RESOURCES_DIR}"
 )
 
 # Link libraries

src/examples/smoke_sim/main.cpp

@@ -294,7 +294,7 @@ void runExample3(const std::string& rootDir, size_t resolutionX,
 
     // Build emitter
     auto dragonMesh = TriangleMesh3::builder().makeShared();
-    std::ifstream objFile(RESOURCES_DIR "dragon.obj");
+    std::ifstream objFile(RESOURCES_DIR "/dragon.obj");
     if (objFile) {
         dragonMesh->readObj(&objFile);
     } else {

src/examples/sph_sim/CMakeLists.txt

@@ -37,7 +37,7 @@ target_compile_options(${target}
 )
 target_compile_definitions(${target}
     PRIVATE
-    RESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../../resources/"
+    RESOURCES_DIR="${RESOURCES_DIR}"
 )
 
 # Link libraries

src/tests/manual_tests/triangle_mesh3_tests.cpp

@@ -102,7 +102,7 @@ JET_END_TEST_F
 JET_BEGIN_TEST_F(TriangleMesh3, BasicIO) {
     TriangleMesh3 triMesh;
 
-    std::ifstream file(RESOURCES_DIR "bunny.obj");
+    std::ifstream file(RESOURCES_DIR "/bunny.obj");
     if (file) {
         triMesh.readObj(&file);
         file.close();

src/tests/manual_tests/triangle_mesh_to_sdf_tests.cpp

@@ -81,7 +81,7 @@ JET_END_TEST_F
 JET_BEGIN_TEST_F(TriangleMeshToSdf, Bunny) {
     TriangleMesh3 triMesh;
 
-    std::ifstream file(RESOURCES_DIR "bunny.obj");
+    std::ifstream file(RESOURCES_DIR "/bunny.obj");
     if (file) {
         triMesh.readObj(&file);
         file.close();
@@ -115,7 +115,7 @@ JET_END_TEST_F
 JET_BEGIN_TEST_F(TriangleMeshToSdf, Dragon) {
     TriangleMesh3 triMesh;
 
-    std::ifstream file(RESOURCES_DIR "dragon.obj");
+    std::ifstream file(RESOURCES_DIR "/dragon.obj");
     if (file) {
         triMesh.readObj(&file);
         file.close();

src/tests/mem_perf_tests/CMakeLists.txt

@@ -38,7 +38,7 @@ target_compile_options(${target}
 )
 target_compile_definitions(${target}
     PRIVATE
-    RESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../../resources/"
+    RESOURCES_DIR="${RESOURCES_DIR}"
 )
 
 # Link libraries

src/tests/time_perf_tests/CMakeLists.txt

@@ -37,7 +37,7 @@ target_compile_options(${target}
 
 target_compile_definitions(${target}
         PRIVATE
-        RESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../../../resources/")
+        RESOURCES_DIR="${RESOURCES_DIR}")
 
 # Link libraries
 target_link_libraries(${target}