conan: build re3 + librw with RelWithDebInfo build_type

This commit is contained in:
Anonymous Maarten 2021-01-03 20:50:35 +01:00 committed by shfil
parent 6b8374f391
commit 3519cbd3e5
3 changed files with 6 additions and 3 deletions

View File

@ -95,7 +95,7 @@ jobs:
conan export re3mss miles-sdk/master@ conan export re3mss miles-sdk/master@
- name: "Download/build dependencies (conan install)" - name: "Download/build dependencies (conan install)"
run: | 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: env:
CONAN_SYSREQUIRES_MODE: enabled CONAN_SYSREQUIRES_MODE: enabled
- name: "Build re3 (conan build)" - name: "Build re3 (conan build)"
@ -107,7 +107,7 @@ jobs:
- name: "Create binary package (cpack)" - name: "Create binary package (cpack)"
working-directory: ./build working-directory: ./build
run: | run: |
cpack cpack -C RelWithDebInfo
- name: "Archive binary package (github artifacts)" - name: "Archive binary package (github artifacts)"
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:

View File

@ -109,7 +109,7 @@ class Re3Conan(ConanFile):
project(cmake_wrapper) project(cmake_wrapper)
include("{}/conanbuildinfo.cmake") include("{}/conanbuildinfo.cmake")
conan_basic_setup(TARGETS) conan_basic_setup(TARGETS NO_OUTPUT_DIRS)
add_subdirectory("{}" re3) add_subdirectory("{}" re3)
""").format(self.install_folder.replace("\\", "/"), """).format(self.install_folder.replace("\\", "/"),

View File

@ -115,4 +115,7 @@ if(RE3_INSTALL)
EXPORT re3-targets EXPORT re3-targets
RUNTIME DESTINATION "." RUNTIME DESTINATION "."
) )
if(MSVC)
install(FILES $<TARGET_PDB_FILE:re3> DESTINATION "." OPTIONAL)
endif()
endif() endif()