From ef50b4c7ab65e2b895ce59b0baebf2ba764c017f Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Mon, 12 Apr 2021 19:05:30 +0200 Subject: [PATCH] Pass on options to Arbutils Signed-off-by: Deukhoofd --- CMakeLists.txt | 3 ++- CMakeLists.txt.in | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 13e04a5..3c985ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.16) include(CheckIPOSupported) include(CMakeLists.txt.in) -include_arbutils() project(CreatureLib) @@ -16,6 +15,8 @@ option(TESTS "Whether the test executable should be build as well." OFF) option(STATICC "Whether gcc and stdc++ should be linked statically to the library." OFF) set(LEVEL_SIZE "8" CACHE STRING "Number of bits to store the level as. Currently reserved, and can only be 8") +include_arbutils() + if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") add_compile_options(-fconcepts) endif () diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in index d2e4181..b401f61 100644 --- a/CMakeLists.txt.in +++ b/CMakeLists.txt.in @@ -11,6 +11,7 @@ ExternalProject_Add(arbutils BUILD_COMMAND "" INSTALL_COMMAND "" TEST_COMMAND "" + CMAKE_ARGS "-DSHARED=${SHARED} -DWINDOWS=${WINDOWS} -DSTATICC=${STATICC}" )