From 4219b79ed84fda54ea6bda3c910324e12798ab2c Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Sun, 9 Aug 2020 17:00:27 +0900 Subject: [PATCH] Fix header usage in MSVS build --- CMakeLists.txt | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 475ed07..430026f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,13 +77,23 @@ target_link_libraries(TrianglesLib PUBLIC ) endif() -target_include_directories(TrianglesLib PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/src - ${SFML_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/build_include # imgui related headers -) +if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") + target_include_directories(TrianglesLib PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/src + ${SFML_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/third_party/imgui # imgui related headers + ${CMAKE_CURRENT_SOURCE_DIR}/third_party/imgui-sfml # imgui-sfml related headers + ) +else() + target_include_directories(TrianglesLib PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/src + ${SFML_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/build_include # imgui related headers + ) +endif() + # Use macro to override imgui config header -target_compile_definitions(TrianglesLib PRIVATE +target_compile_definitions(TrianglesLib PUBLIC "IMGUI_USER_CONFIG=\"${CMAKE_CURRENT_SOURCE_DIR}/third_party/imgui-sfml/imconfig-SFML.h\"") if(CMAKE_BUILD_TYPE MATCHES "Debug")