Skip to content

Commit 1bce566

Browse files
committed
CMake Update: fix double include + reorder sources
- external/stb_image.h was included twice in the source macros - move the main.cc file to the top of book sources
1 parent 0eb9373 commit 1bce566

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

CMakeLists.txt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ set ( EXTERNAL
2020
)
2121

2222
set ( SOURCE_ONE_WEEKEND
23-
src/external/stb_image.h
24-
23+
src/InOneWeekend/main.cc
2524
src/InOneWeekend/camera.h
2625
src/InOneWeekend/color.h
2726
src/InOneWeekend/hittable.h
@@ -33,13 +32,10 @@ set ( SOURCE_ONE_WEEKEND
3332
src/InOneWeekend/rtweekend.h
3433
src/InOneWeekend/sphere.h
3534
src/InOneWeekend/vec3.h
36-
37-
src/InOneWeekend/main.cc
3835
)
3936

4037
set ( SOURCE_NEXT_WEEK
41-
src/external/stb_image.h
42-
38+
src/TheNextWeek/main.cc
4339
src/TheNextWeek/aabb.h
4440
src/TheNextWeek/bvh.h
4541
src/TheNextWeek/camera.h
@@ -57,13 +53,10 @@ set ( SOURCE_NEXT_WEEK
5753
src/TheNextWeek/sphere.h
5854
src/TheNextWeek/texture.h
5955
src/TheNextWeek/vec3.h
60-
61-
src/TheNextWeek/main.cc
6256
)
6357

6458
set ( SOURCE_REST_OF_YOUR_LIFE
65-
src/external/stb_image.h
66-
59+
src/TheRestOfYourLife/main.cc
6760
src/TheRestOfYourLife/aabb.h
6861
src/TheRestOfYourLife/camera.h
6962
src/TheRestOfYourLife/color.h
@@ -82,8 +75,6 @@ set ( SOURCE_REST_OF_YOUR_LIFE
8275
src/TheRestOfYourLife/sphere.h
8376
src/TheRestOfYourLife/texture.h
8477
src/TheRestOfYourLife/vec3.h
85-
86-
src/TheRestOfYourLife/main.cc
8778
)
8879

8980
include_directories(src)

0 commit comments

Comments
 (0)