Clean up find file for LuaJit, add one for Sol2

apps/openmw-mp/CMakeLists.txt

@@ -17,11 +17,11 @@ endif(ENABLE_BREAKPAD)
 
 
 find_package(LuaJit REQUIRED)
+find_package(Sol2 REQUIRED)
 
-set(LuaScript_Headers ${LUA_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/extern/sol/sol.hpp)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DENABLE_LUA")
-include_directories(${LUA_INCLUDE_DIR} ${LUAJIT_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/extern/sol)
+include_directories(${LuaJit_INCLUDE_DIR} ${Sol2_INCLUDE_DIR})
 
 
 # local files
@@ -145,8 +145,7 @@ target_link_libraries(tes3mp-server
     #${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${RakNet_LIBRARY}
     components
-    ${LUA_LIBRARIES}
-    ${LUAJIT_LIBRARY}
+    ${LuaJit_LIBRARIES}
     ${Breakpad_Library}
 )
 

cmake/FindLuaJit.cmake

@@ -1,22 +1,14 @@
-include(LibFindMacros)
-
-# Use pkg-config to get hints about paths
-libfind_pkg_check_modules(LUAJIT_PKGCONF luajit)
+# Once found, defines:
+#  LuaJit_FOUND
+#  LuaJit_INCLUDE_DIRS
+#  LuaJit_LIBRARIES
 
-find_path(LUAJIT_INCLUDE_DIR
-        NAMES luajit.h
-        PATHS ${LUAJIT_PKGCONF_INCLUDE_DIRS}
-        )
-
-find_library(LUAJIT_LIBRARY
-        NAMES luajit-5.1 luajit
-        PATHS ${LUAJIT_PKGCONF_LIBRARY_DIRS}
-        )
+include(LibFindMacros)
 
-set(LUAJIT_PROCESS_INCLUDES LUAJIT_INCLUDE_DIR)
-set(LUAJIT_PROCESS_LIBS LUAJIT_LIBRARY)
+libfind_pkg_detect(LuaJit luajit
+    FIND_PATH luajit.h
+    FIND_LIBRARY NAMES luajit-5.1 luajit
+)
 
 libfind_process(LuaJit)
 
-set(LUA_LIBRARY LUAJIT_LIBRARY)
-set(LUA_INCLUDE_DIR LUAJIT_INCLUDE_DIR)

cmake/FindSol2.cmake

@@ -0,0 +1,11 @@
+# Once found, defines:
+#  Sol2_FOUND
+#  Sol2_INCLUDE_DIRS
+
+include(LibFindMacros)
+
+libfind_pkg_detect(Sol2 sol2
+    FIND_PATH sol.hpp
+)
+libfind_process(Sol2)
+