Change CMake files to simplify them.

Also disable dorayme.cpp for now as it if wrongly taken in the rayonnement library.

source/CMakeLists.txt

@@ -31,10 +31,10 @@ endif()
 
 
 # The main executable
-add_executable(dorayme main.cpp)
+#add_executable(dorayme main.cpp)
 
-add_dependencies(dorayme LuaCore)
+#add_dependencies(dorayme LuaCore)
-target_link_libraries(dorayme rayonnement ${LUA_LIBRARIES})
+#target_link_libraries(dorayme rayonnement ${LUA_LIBRARIES})
 
 
 if (COVERALLS)

source/main.cpp

@@ -22,7 +22,7 @@ static int l_sin (lua_State *L) {
     lua_pushnumber(L, sin(d));  /* push result */
     return 1;  /* number of results */
 }
-
+#if 0
 int main(int argc, char *argv[])
 {
     char buff[256];
@@ -49,3 +49,4 @@ int main(int argc, char *argv[])
     lua_close(L);
     return 0;
 }
+#endif

tests/CMakeLists.txt

@@ -3,6 +3,10 @@ project(DoRayTested)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
+#Every executable here need these include folders and library
+include_directories(../source/include ../source/pattern ../source/uvpattern)
+link_libraries(rayonnement)
+
 set(TESTS_SRC math_test.cpp tuple_test.cpp colour_test.cpp canvas_test.cpp matrix_test.cpp transformation_test.cpp
         ray_test.cpp intersect_test.cpp sphere_test.cpp light_test.cpp material_test.cpp world_test.cpp camera_test.cpp
         shape_test.cpp plane_test.cpp pattern_test.cpp cube_test.cpp cylinder_test.cpp cone_test.cpp group_test.cpp
@@ -10,9 +14,8 @@ set(TESTS_SRC math_test.cpp tuple_test.cpp colour_test.cpp canvas_test.cpp matri
 
 add_executable(testMyRays)
 target_include_directories(testMyRays PUBLIC ${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
-target_include_directories(testMyRays PUBLIC ../source/include ../source/patter ../source/uvpattern)
 target_sources(testMyRays PRIVATE ${TESTS_SRC})
-target_link_libraries(testMyRays gtest gtest_main rayonnement Threads::Threads)
+target_link_libraries(testMyRays gtest gtest_main Threads::Threads)
 
 gtest_discover_tests(testMyRays
    WORKING_DIRECTORY ${PROJECT_DIR}
@@ -21,89 +24,58 @@ gtest_discover_tests(testMyRays
 
 
 add_executable(hw3render)
-target_include_directories(hw3render PUBLIC ../source/include)
 target_sources(hw3render PRIVATE hw3render.cpp)
-target_link_libraries(hw3render rayonnement)
 
 add_executable(test_render)
-target_include_directories(test_render PUBLIC ../source/include)
 target_sources(test_render PRIVATE test_render.cpp)
-target_link_libraries(test_render rayonnement)
 
 add_executable(ch5_test)
-target_include_directories(ch5_test PUBLIC ../source/include)
 target_sources(ch5_test PRIVATE ch5_test.cpp)
-target_link_libraries(ch5_test rayonnement)
 
 add_executable(ch6_test)
-target_include_directories(ch6_test PUBLIC ../source/include)
 target_sources(ch6_test PRIVATE ch6_test.cpp)
-target_link_libraries(ch6_test rayonnement)
 
 add_executable(ch7_test)
-target_include_directories(ch7_test PUBLIC ../source/include)
 target_sources(ch7_test PRIVATE ch7_test.cpp)
-target_link_libraries(ch7_test rayonnement)
 
 add_executable(ch9_test)
-target_include_directories(ch9_test PUBLIC ../source/include)
 target_sources(ch9_test PRIVATE ch9_test.cpp)
-target_link_libraries(ch9_test rayonnement)
 
 add_executable(ch10_test)
-target_include_directories(ch10_test PUBLIC ../source/include)
 target_sources(ch10_test PRIVATE ch10_test.cpp)
-target_link_libraries(ch10_test rayonnement)
 
 add_executable(ch11_reflection)
-target_include_directories(ch11_reflection PUBLIC ../source/include)
 target_sources(ch11_reflection PRIVATE ch11_reflection.cpp)
-target_link_libraries(ch11_reflection rayonnement)
 
 add_executable(ch11_refraction)
-target_include_directories(ch11_refraction PUBLIC ../source/include)
 target_sources(ch11_refraction PRIVATE ch11_refraction.cpp)
-target_link_libraries(ch11_refraction rayonnement)
 
 add_executable(ch11_test)
-target_include_directories(ch11_test PUBLIC ../source/include)
 target_sources(ch11_test PRIVATE ch11_test.cpp)
-target_link_libraries(ch11_test rayonnement)
 
 add_executable(ch12_test)
-target_include_directories(ch12_test PUBLIC ../source/include)
 target_sources(ch12_test PRIVATE ch12_test.cpp)
-target_link_libraries(ch12_test rayonnement)
 
 add_executable(ch13_test)
-target_include_directories(ch13_test PUBLIC ../source/include)
 target_sources(ch13_test PRIVATE ch13_test.cpp)
-target_link_libraries(ch13_test rayonnement)
 
 add_executable(ch13_cone)
-target_include_directories(ch13_cone PUBLIC ../source/include)
 target_sources(ch13_cone PRIVATE ch13_cone.cpp)
-target_link_libraries(ch13_cone rayonnement)
 
 add_executable(ch14_test)
-target_include_directories(ch14_test PUBLIC ../source/include)
 target_sources(ch14_test PRIVATE ch14_test.cpp)
-target_link_libraries(ch14_test rayonnement)
 
 add_executable(arealight_test)
-target_include_directories(arealight_test PUBLIC ../source/include)
 target_sources(arealight_test PRIVATE arealight_test.cpp)
-target_link_libraries(arealight_test rayonnement)
 
 add_executable(triangle_rendertest)
-target_include_directories(triangle_rendertest PUBLIC ../source/include)
 target_sources(triangle_rendertest PRIVATE triangle_rendertest.cpp)
-target_link_libraries(triangle_rendertest rayonnement)
 
 add_executable(christmasball_render)
-target_include_directories(christmasball_render PUBLIC ../source/include)
 target_sources(christmasball_render PRIVATE christmasball_render.cpp)
-target_link_libraries(christmasball_render rayonnement)
+
+add_executable(uvmap_checkeredsphere)
+target_sources(uvmap_checkeredsphere PRIVATE uvmap_checkeredsphere.cpp)
 
 add_test(NAME Chapter05_Test COMMAND $<TARGET_FILE:ch5_test>)
 add_test(NAME Chapter06_Test COMMAND $<TARGET_FILE:ch6_test>)
@@ -118,6 +90,7 @@ add_test(NAME Chapter13_Test COMMAND $<TARGET_FILE:ch13_test>)
 add_test(NAME Chapter13_ConeBonus COMMAND $<TARGET_FILE:ch13_cone>)
 add_test(NAME Chapter14_Test COMMAND $<TARGET_FILE:ch14_test>)
 add_test(NAME AreaLight_Test COMMAND $<TARGET_FILE:arealight_test>)
+add_test(NAME UVMap_CheckeredSphere COMMAND $<TARGET_FILE:uvmap_checkeredsphere>)
 add_test(NAME Test_Rendering COMMAND $<TARGET_FILE:test_render>)
 add_test(NAME Triangle_RenderTest COMMAND $<TARGET_FILE:triangle_rendertest>)
 add_test(NAME ChristmasBall_Rendering COMMAND $<TARGET_FILE:christmasball_render>)