From 3d922c90e9ae81518c10bc6eff186d94962cc463 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Mon, 12 Jul 2021 17:52:23 +0200 Subject: [PATCH 1/2] cmake: add _INSTALL cmake option --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5396d3b4..6ec3cc63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,7 @@ endif() set(${PROJECT}_AUDIO "OAL" CACHE STRING "Audio") +option(${PROJECT}_INSTALL "Enable installation of ${EXECUTABLE} + gamefiles" OFF) option(${PROJECT}_WITH_OPUS "Build ${EXECUTABLE} with opus support" OFF) option(${PROJECT}_WITH_LIBSNDFILE "Build ${EXECUTABLE} with libsndfile (instead of internal decoder)" OFF) From 152148d71f4988c1d24533e61e03bdcfe84a506c Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Mon, 12 Jul 2021 17:52:45 +0200 Subject: [PATCH 2/2] conan: copy gamefiles to source folder so cmake install succeeds --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index cabcc4c2..b6424eb2 100644 --- a/conanfile.py +++ b/conanfile.py @@ -60,7 +60,7 @@ class Re3Conan(ConanFile): self.requires("opusfile/0.12") def export_sources(self): - for d in ("cmake", "src"): + for d in ("cmake", "gamefiles", "src"): shutil.copytree(src=d, dst=os.path.join(self.export_sources_folder, d)) self.copy("CMakeLists.txt")