[build][refactoring] Converted Library to a shared library, and moved…

… unnecessary files to tools directory (#24)
abdelrahim-hentabli · Apr 20, 2024 · b1d9332 · b1d9332
1 parent 48b02f5
commit b1d9332
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 19 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,21 +1,10 @@
-find_package(PNG REQUIRED)
+file(GLOB RAY_TRACER_SOURCES *.cpp)
 
-add_library(ray_tracer OBJECT camera.cpp hierarchy.cpp dump_png.cpp flat_shader.cpp parse.cpp phong_shader.cpp plane.cpp reflective_shader.cpp render_world.cpp sphere.cpp box.cpp mesh.cpp)
+add_library(ray_tracer SHARED ${RAY_TRACER_SOURCES})
 
 target_include_directories(ray_tracer
-    PRIVATE ${PNG_INCLUDE_DIR}
     PRIVATE ${PROJECT_SOURCE_DIR}/include
     PRIVATE ${CMAKE_BINARY_DIR}/generated)
 
 target_compile_options(ray_tracer
     PUBLIC -ffast-math)
-
-target_link_libraries(ray_tracer ${PNG_LIBRARY})
-
-add_executable(original_ray_tracer main.cpp)
-
-target_include_directories(original_ray_tracer
-    PRIVATE ${PNG_INCLUDE_DIR}
-    PRIVATE ${PROJECT_SOURCE_DIR}/include)
-
-target_link_libraries(original_ray_tracer ray_tracer)
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -2,5 +2,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 
 add_subdirectory(third-party/googletest)
 add_subdirectory(third-party/benchmark)
+add_subdirectory(common)
+add_subdirectory(demos)
 add_subdirectory(test)
-add_subdirectory(benchmark)
+add_subdirectory(benchmark)
diff --git a/tools/benchmark/CMakeLists.txt b/tools/benchmark/CMakeLists.txt
@@ -3,8 +3,10 @@ add_executable(benchmarks source/main.cpp)
 target_include_directories(benchmarks
     PRIVATE ${PROJECT_SOURCE_DIR}/include
     PRIVATE ./include
-    PRIVATE ${CMAKE_BINARY_DIR}/generated)
+    PRIVATE ${CMAKE_BINARY_DIR}/generated
+    PRIVATE $<TARGET_PROPERTY:tool_common,INTERFACE_INCLUDE_DIRECTORIES>)
 
 target_link_libraries(benchmarks
-    ray_tracer
-    benchmark::benchmark)
+    PRIVATE ray_tracer
+    PRIVATE tool_common
+    PRIVATE benchmark::benchmark)
diff --git a/tools/common/CMakeLists.txt b/tools/common/CMakeLists.txt
@@ -0,0 +1,17 @@
+find_package(PNG REQUIRED)
+
+file(GLOB TOOL_COMMON_SOURCES *.cpp)
+
+add_library(tool_common OBJECT ${TOOL_COMMON_SOURCES})
+
+set_target_properties(tool_common PROPERTIES CXX_STANDARD 17)
+
+target_include_directories(tool_common
+    PUBLIC  .
+    PRIVATE ${PNG_INCLUDE_DIR}
+    PRIVATE ${PROJECT_SOURCE_DIR}/include
+    PRIVATE ${CMAKE_BINARY_DIR}/generated
+)
+
+target_link_libraries(tool_common
+    PUBLIC ${PNG_LIBRARY})
diff --git a/src/dump_png.cpp → tools/common/dump_png.cpp b/src/dump_png.cpp → tools/common/dump_png.cpp
diff --git a/include/dump_png.hpp → tools/common/dump_png.hpp b/include/dump_png.hpp → tools/common/dump_png.hpp
diff --git a/src/parse.cpp → tools/common/parse.cpp b/src/parse.cpp → tools/common/parse.cpp
diff --git a/include/parse.hpp → tools/common/parse.hpp b/include/parse.hpp → tools/common/parse.hpp
diff --git a/tools/demos/CMakeLists.txt b/tools/demos/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(image)
diff --git a/tools/demos/image/CMakeLists.txt b/tools/demos/image/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_executable(image_demo main.cpp)
+
+target_include_directories(image_demo
+    PRIVATE ${PROJECT_SOURCE_DIR}/include
+    PRIVATE $<TARGET_PROPERTY:tool_common,INTERFACE_INCLUDE_DIRECTORIES>
+)
+
+target_link_libraries(image_demo
+    PRIVATE ray_tracer
+    PRIVATE tool_common)
diff --git a/src/main.cpp → tools/demos/image/main.cpp b/src/main.cpp → tools/demos/image/main.cpp
diff --git a/tools/test/CMakeLists.txt b/tools/test/CMakeLists.txt
@@ -10,9 +10,11 @@ target_include_directories(tests
     PRIVATE ${PNG_INCLUDE_DIR}
     PRIVATE ${PROJECT_SOURCE_DIR}/include
     PRIVATE ./include
-    PRIVATE ${CMAKE_BINARY_DIR}/generated)
+    PRIVATE ${CMAKE_BINARY_DIR}/generated
+    PRIVATE $<TARGET_PROPERTY:tool_common,INTERFACE_INCLUDE_DIRECTORIES>)
 
 target_link_libraries(tests 
     ray_tracer
+    tool_common
     ${PNG_LIBRARY}
-    GTest::gtest_main)
+    GTest::gtest_main)