mirror of
https://github.com/zoriya/Bomberman.git
synced 2026-05-30 01:05:24 +00:00
cmake installing, need to fix lib not found
This commit is contained in:
+4
-5
@@ -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)
|
||||
|
||||
@@ -12,7 +12,6 @@ if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
endif ()
|
||||
|
||||
|
||||
find_package(Lua REQUIRED)
|
||||
include_directories(${LIB_NAME} ${LUA_INCLUDE_DIR})
|
||||
|
||||
set(HEADERS
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
extern "C" {
|
||||
#include "lua.h"
|
||||
#include "lualib.h"
|
||||
#include "lauxlib.h"
|
||||
}
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user