Merge pull request #16 from MWMadness/fix/ninja-build

Fix Ninja Build

apps/openmw-mp/CMakeLists.txt

@@ -20,7 +20,7 @@ if(BUILD_WITH_LUA)
     find_package(LuaJit REQUIRED)
 
     MESSAGE(STATUS "Found LuaJit_LIBRARIES: ${LuaJit_LIBRARIES}")
-    MESSAGE(STATUS "Found LuaJit_INCLUDE_DIRS: ${LuaJit_INCLUDE_DIRS}")
+    MESSAGE(STATUS "Found LuaJit_INCLUDE_DIR: ${LuaJit_INCLUDE_DIR}")
 
     set(LuaScript_Sources
             Script/LangLua/LangLua.cpp
@@ -29,7 +29,7 @@ if(BUILD_WITH_LUA)
             Script/LangLua/LangLua.hpp)
 
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_LUA")
-    include_directories(SYSTEM ${LuaJit_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/extern/LuaBridge)
+    include_directories(SYSTEM ${LuaJit_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/extern/LuaBridge)
 endif(BUILD_WITH_LUA)
 
 include_directories(${CMAKE_SOURCE_DIR}/extern/PicoSHA2)

apps/openmw-mp/Script/Types.hpp

@@ -101,7 +101,11 @@ struct ScriptFunctionPointer : public ScriptIdentity
     void *addr;
 
     template<typename R, typename... Types>
+#if (!defined(__clang__) && defined(__GNUC__))
     constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(reinterpret_cast<void*>(reinterpret_cast<intptr_t>(addr))) {}
+#else
+    constexpr ScriptFunctionPointer(Function<R, Types...> addr) : ScriptIdentity(addr), addr(addr) {}
+#endif
 };
 
 struct ScriptFunctionData

cmake/FindFFmpeg.cmake

@@ -10,7 +10,7 @@
 #  FFmpeg_LIBRARIES     - Link these to use the required ffmpeg components.
 #  FFmpeg_DEFINITIONS   - Compiler switches required for using the required ffmpeg components.
 #
-# For each of the components it will additionaly set.
+# For each of the components it will additionally set.
 #   - AVCODEC
 #   - AVDEVICE
 #   - AVFORMAT

cmake/FindLZ4.cmake

@@ -95,6 +95,8 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LZ4 DEFAULT_MSG
         LZ4_LIBRARY LZ4_INCLUDE_DIR LZ4_VERSION)
 
+set(LZ4_INCLUDE_DIR ${LZ4_INCLUDE_DIR} CACHE PATH "LZ4 include dir hint")
+set(LZ4_LIBRARY ${LZ4_LIBRARY} CACHE FILEPATH "LZ4 library path hint")
 mark_as_advanced(LZ4_INCLUDE_DIR LZ4_LIBRARY)
 
 set(LZ4_LIBRARIES ${LZ4_LIBRARY})

cmake/FindLuaJit.cmake

@@ -1,14 +1,13 @@
 # Once found, defines:
 #  LuaJit_FOUND
-#  LuaJit_INCLUDE_DIRS
+#  LuaJit_INCLUDE_DIR
 #  LuaJit_LIBRARIES
 
 include(LibFindMacros)
 
 libfind_pkg_detect(LuaJit luajit
-        FIND_PATH luajit.h
-        PATH_SUFFIXES luajit
-        FIND_LIBRARY NAMES luajit-5.1 luajit
+        FIND_PATH luajit.h PATH_SUFFIXES luajit luajit-2.1
+        FIND_LIBRARY luajit-5.1 luajit
         )
 
 libfind_process(LuaJit)