From 508d86953d8a450e227619f8c882b9a3ed0dffd5 Mon Sep 17 00:00:00 2001 From: Bluub Date: Wed, 16 Jun 2021 14:49:42 +0200 Subject: [PATCH] cmake installing, need to fix lib not found --- CMakeLists.txt | 9 ++++----- lib/LuaGate/CMakeLists.txt | 1 - lib/LuaGate/sources/lua.hpp | 5 +++++ lib/lua/FindLua.cmake | 9 +++++---- 4 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 lib/LuaGate/sources/lua.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index f7fa7d4f..0b683c27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,11 +6,10 @@ set(CMAKE_CXX_STANDARD 20) cmake_minimum_required(VERSION 3.10) -find_package(Lua REQUIRED) -#if (NOT LUA_FOUND) -# set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/lib/lua/) -# find_package(Lua REQUIRED) -#endif() +if (NOT LUA_FOUND) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/lib/lua/") + find_package(Lua REQUIRED) +endif() include_directories(bomberman ${LUA_INCLUDE_DIR}) include_directories(bomberman lib/Ray/sources) diff --git a/lib/LuaGate/CMakeLists.txt b/lib/LuaGate/CMakeLists.txt index ae7c7c4d..c1f4cf7d 100644 --- a/lib/LuaGate/CMakeLists.txt +++ b/lib/LuaGate/CMakeLists.txt @@ -12,7 +12,6 @@ if (CMAKE_COMPILER_IS_GNUCXX) endif () -find_package(Lua REQUIRED) include_directories(${LIB_NAME} ${LUA_INCLUDE_DIR}) set(HEADERS diff --git a/lib/LuaGate/sources/lua.hpp b/lib/LuaGate/sources/lua.hpp new file mode 100644 index 00000000..5d6b3a05 --- /dev/null +++ b/lib/LuaGate/sources/lua.hpp @@ -0,0 +1,5 @@ +extern "C" { +#include "lua.h" +#include "lualib.h" +#include "lauxlib.h" +} \ No newline at end of file diff --git a/lib/lua/FindLua.cmake b/lib/lua/FindLua.cmake index afc099f9..137ce9d7 100644 --- a/lib/lua/FindLua.cmake +++ b/lib/lua/FindLua.cmake @@ -53,9 +53,6 @@ ExternalProject_Add(lua ExternalProject_Get_property(lua SOURCE_DIR) message("wow") -set(LUA_LIBRARIES ${SOURCE_DIR}/src/lua ${SOURCE_DIR}/src/lualib.a) -set(LUA_INCLUDE_DIR ${SOURCE_DIR}/src) - cmake_policy(PUSH) # Policies apply to functions at definition-time cmake_policy(SET CMP0012 NEW) # For while(TRUE) @@ -244,7 +241,11 @@ if (LUA_LIBRARY) endif () endif () -include(${CMAKE_SOURCE_DIR}/cmake/Modules/FindPackageHandleStandardArgs.cmake) + +set(LUA_LIBRARIES ${SOURCE_DIR}/src/lua ${SOURCE_DIR}/src/lualib.a) +set(LUA_INCLUDE_DIR ${SOURCE_DIR}/src) + +include(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if # all listed variables are TRUE FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua