Merge branch 'master' of https://github.com/OpenMW/openmw into unshield

Conflicts: apps/wizard/CMakeLists.txt
10 years ago · 4bf5c89e6f
parent abf49267ea a0c454b01c
commit 4bf5c89e6f
1 changed files with 1 additions and 1 deletions
--- a/apps/wizard/CMakeLists.txt
+++ b/apps/wizard/CMakeLists.txt
@ -95,7 +95,7 @@ include(${QT_USE_FILE})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})

 if (OPENMW_USE_UNSHIELD)
-    include_directories(${LIBUNSHIELD_INCLUDE})
+    include_directories(${LIBUNSHIELD_INCLUDE_DIR})
 endif()

 add_executable(openmw-wizard