mirror
/
re3
Archived
Code Issues 124 Pull Requests 24 Projects Releases Wiki Activity

Labels Milestones

New Pull Request

Fix cmake installation with conan #1233

Merged
madebr merged 2 commits from cmake-fixes into master 3 years ago
Conversation 0 Commits 2 Files Changed 2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File

1
CMakeLists.txt
Unescape Escape View File

@ -18,6 +18,7 @@ endif()
set(${PROJECT}_AUDIO "OAL" CACHE STRING "Audio") 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_OPUS "Build ${EXECUTABLE} with opus support" OFF)
option(${PROJECT}_WITH_LIBSNDFILE "Build ${EXECUTABLE} with libsndfile (instead of internal decoder)" OFF) option(${PROJECT}_WITH_LIBSNDFILE "Build ${EXECUTABLE} with libsndfile (instead of internal decoder)" OFF)

2
conanfile.py
Unescape Escape View File

@ -60,7 +60,7 @@ class Re3Conan(ConanFile):
self.requires("opusfile/0.12") self.requires("opusfile/0.12")
def export_sources(self): 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)) shutil.copytree(src=d, dst=os.path.join(self.export_sources_folder, d))
self.copy("CMakeLists.txt") self.copy("CMakeLists.txt")