Merge remote-tracking branch 'upstream/master' into feat/new-options-library

This commit is contained in:
Par Winzell 2018-12-17 16:10:38 -08:00
commit 1a650a565a
1 changed files with 3 additions and 0 deletions

View File

@ -32,6 +32,9 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
find_package(Threads REQUIRED)
find_package(Iconv QUIET)
# create a compilation database for e.g. clang-tidy
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
if (WIN32)
# this will suffice for now; don't really care about 32-bit
set(LIBXML2_INCLUDE_DIRS ${FBXSDK_INCLUDE_DIR})