CMake: fix semantic merge errors due to rebase

Helco · Nov 23, 2018 · 70472e1 · 70472e1
1 parent dcbcba8
commit 70472e1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ As such a typical CMake call on Windows to develop this project looks like this:
 cmake -DSDL2_PATH="C:/libs/SDL2-2.0.5/" -T llvm ..
 ```
 
-You might have to copy your `SDL.dll` in the `build/Debug` or `build/Release` directory to start pcmockup.
+You might have to copy your `SDL.dll` in the `build/pcmockup/Debug` or `build/pcmockup/Release` directory to start pcmockup.
 
 ### With make/gcc
 

diff --git a/pcmockup/CMakeLists.txt b/pcmockup/CMakeLists.txt
@@ -21,4 +21,7 @@ target_link_libraries(pcmockup
     ${STB_LIBRARY}
     podrenderer
 )
+target_include_directories(pcmockup
+    PRIVATE ${SDL2_INCLUDE_DIR}
+)
 enable_warnings(pcmockup)
diff --git a/renderer/CMakeLists.txt b/renderer/CMakeLists.txt
@@ -15,9 +15,10 @@ set(sources_podrenderer
 assign_source_group(${sources_podrenderer})
 
 add_library(podrenderer ${sources_podrenderer})
-target_include_directories(podrenderer PUBLIC
-    "../pcmockup/" # to access pebble.h
-    ${SDL2_INCLUDE_DIR} # for debug output
+target_include_directories(podrenderer
+    INTERFACE "."
+    PRIVATE "../pcmockup/" # to access pebble.h
+    PRIVATE ${SDL2_INCLUDE_DIR} # for debug output
 )
 target_compile_definitions(podrenderer
     PUBLIC REAL_USE_FLOAT