From d7751422f7eb6fe49a90cdc0b61f8393b6879eaa Mon Sep 17 00:00:00 2001 From: Bluub Date: Wed, 16 Jun 2021 12:06:08 +0200 Subject: [PATCH] try fix cmake --- CMakeLists.txt | 14 -------------- lib/lua/Findlua.cmake | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d131ab89..343e2324 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,20 +4,6 @@ project(bomberman) set(CMAKE_CXX_STANDARD 20) cmake_minimum_required(VERSION 3.10) -include(ExternalProject) - -ExternalProject_Add(lua - URL "https://www.lua.org/ftp/lua-5.4.3.tar.gz" - CONFIGURE_COMMAND "" - BUILD_COMMAND make generic - BUILD_ALWAYS true - BUILD_IN_SOURCE true - INSTALL_COMMAND "" -) -ExternalProject_Get_property(lua SOURCE_DIR) - -set(LUA_LIBRARIES ${PROJECT}/lua-prefix/src/lua/src/lua ${PROJECT_SOURCE_DIR}/lua-prefix/src/lua/src/lualib.a) -set(LUA_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/lua-prefix/src/lua/src) find_package(Lua QUIET) if (NOT LUA_FOUND) diff --git a/lib/lua/Findlua.cmake b/lib/lua/Findlua.cmake index 2afa3892..c92c71d5 100644 --- a/lib/lua/Findlua.cmake +++ b/lib/lua/Findlua.cmake @@ -40,6 +40,22 @@ This is because, the lua location is not standardized and may exist in locations other than lua/ #]=======================================================================] +include(ExternalProject) + +ExternalProject_Add(lua + URL "https://www.lua.org/ftp/lua-5.4.3.tar.gz" + CONFIGURE_COMMAND "" + BUILD_COMMAND make generic + BUILD_ALWAYS true + BUILD_IN_SOURCE true + INSTALL_COMMAND "" +) +ExternalProject_Get_property(lua SOURCE_DIR) + +set(LUA_LIBRARIES ${PROJECT_SOURCE_DIR}/lua-prefix/src/lua/src/lua ${PROJECT_SOURCE_DIR}/lua-prefix/src/lua/src/lualib.a) +set(LUA_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/lua-prefix/src/lua/src) + + cmake_policy(PUSH) # Policies apply to functions at definition-time cmake_policy(SET CMP0012 NEW) # For while(TRUE)