summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-09-03 00:38:46 +0200
committerGitHub <noreply@github.com>2021-09-03 00:38:46 +0200
commit3233ffe1c4b99e8efb4c41c6794b4fce880cf503 (patch)
tree7c9ffb1cefb4138104612a535fb125c515eb5d95
parent3569b7edfeb805931352a4f236d862063d33756c (diff)
parent152148d71f4988c1d24533e61e03bdcfe84a506c (diff)
Merge pull request #1233 from madebr/cmake-fixesHEADmaster
Fix cmake installation with conan
-rw-r--r--CMakeLists.txt1
-rw-r--r--conanfile.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index adf3c29f..fedf86aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,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)
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")