From c21bb3bb4d3508d2cf978f54010c0728d8577cb7 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Mon, 31 Oct 2016 15:24:46 +0100 Subject: [PATCH] Make SGCT work between Debug and Release without manual removal --- ext/sgct | 2 +- support/cmake/support_macros.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/sgct b/ext/sgct index fb95dc335b..c7f321dd50 160000 --- a/ext/sgct +++ b/ext/sgct @@ -1 +1 @@ -Subproject commit fb95dc335ba7d396723fbfeca64aa3b7451376c8 +Subproject commit c7f321dd504c184e6ac65d26b33aec2f7699c476 diff --git a/support/cmake/support_macros.cmake b/support/cmake/support_macros.cmake index 04adf37437..b997b88fa6 100644 --- a/support/cmake/support_macros.cmake +++ b/support/cmake/support_macros.cmake @@ -124,6 +124,7 @@ function (add_external_dependencies) set(SGCT_TEXT OFF CACHE BOOL "" FORCE) set(SGCT_BUILD_CSHARP_PROJECTS OFF CACHE BOOL "" FORCE) set(SGCT_LIGHT_ONLY ON CACHE BOOL "" FORCE) + set(SGCT_CUSTOMOUTPUTDIRS OFF CACHE BOOL "" FORCE) add_subdirectory(${OPENSPACE_EXT_DIR}/sgct) target_include_directories(libOpenSpace SYSTEM PUBLIC ${OPENSPACE_EXT_DIR}/sgct/include)