summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.github/workflows/build-cmake-conan.yml4
-rw-r--r--conanfile.py2
-rw-r--r--src/CMakeLists.txt3
3 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/build-cmake-conan.yml b/.github/workflows/build-cmake-conan.yml
index 4bd2b08c..2d9b3a98 100644
--- a/.github/workflows/build-cmake-conan.yml
+++ b/.github/workflows/build-cmake-conan.yml
@@ -95,7 +95,7 @@ jobs:
conan export re3mss miles-sdk/master@
- name: "Download/build dependencies (conan install)"
run: |
- conan install ${{ github.workspace }} re3/master@ -if build -o re3:audio=${{ matrix.audio }} -o librw:platform=${{ matrix.platform }} -o librw:gl3_gfxlib=${{ matrix.gl3_gfxlib || 'glfw' }} --build missing -pr:h ./host_profile -pr:b default
+ conan install ${{ github.workspace }} re3/master@ -if build -o re3:audio=${{ matrix.audio }} -o librw:platform=${{ matrix.platform }} -o librw:gl3_gfxlib=${{ matrix.gl3_gfxlib || 'glfw' }} --build missing -pr:h ./host_profile -pr:b default -s re3:build_type=RelWithDebInfo -s librw:build_type=RelWithDebInfo
env:
CONAN_SYSREQUIRES_MODE: enabled
- name: "Build re3 (conan build)"
@@ -107,7 +107,7 @@ jobs:
- name: "Create binary package (cpack)"
working-directory: ./build
run: |
- cpack
+ cpack -C RelWithDebInfo
- name: "Archive binary package (github artifacts)"
uses: actions/upload-artifact@v2
with:
diff --git a/conanfile.py b/conanfile.py
index 958ef689..f0d63a20 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -109,7 +109,7 @@ class Re3Conan(ConanFile):
project(cmake_wrapper)
include("{}/conanbuildinfo.cmake")
- conan_basic_setup(TARGETS)
+ conan_basic_setup(TARGETS NO_OUTPUT_DIRS)
add_subdirectory("{}" re3)
""").format(self.install_folder.replace("\\", "/"),
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a2052471..2f663061 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -115,4 +115,7 @@ if(RE3_INSTALL)
EXPORT re3-targets
RUNTIME DESTINATION "."
)
+ if(MSVC)
+ install(FILES $<TARGET_PDB_FILE:re3> DESTINATION "." OPTIONAL)
+ endif()
endif()