Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ jobs:
conan-password: ${{secrets.LKEB_UPLOAD_USER_PASSWORD}}
conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}}
rs_ssh_key: ${{ secrets.RULESSUPPORT_DEPLOY_KEY }}
sentry-url: ${{secrets.LKEB_SENTRY_URL }}
sentry-org: ${{secrets.LKEB_SENTRY_ORG }}
sentry-project: ${{secrets.LKEB_SENTRY_PROJECT }}
sentry-auth-token: ${{secrets.LKEB_SENTRY_AUTH_TOKEN }}

- name: Linux build
if: startsWith(matrix.os, 'ubuntu')
Expand Down Expand Up @@ -100,4 +104,4 @@ jobs:
build-arch: ${{matrix.build-arch}}
conan-user: ${{secrets.LKEB_UPLOAD_USER}}
conan-password: ${{secrets.LKEB_UPLOAD_USER_PASSWORD}}
conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}}
conan-pem: ${{secrets.LKEB_UPLOAD_CERT_CHAIN}}
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG")
endif()

# -----------------------------------------------------------------------------
Expand Down
13 changes: 0 additions & 13 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,6 @@ def package(self):
release_dir,
]
)



# Add the pdb files next to the libs for RelWithDebInfo linking
if self.settings.os == "Windows":
print("Copying PDBs...")
pdb_dest = pathlib.Path(package_dir, "RelWithDebInfo", "pdb")
pdb_dest.mkdir()
pdb_files = pdb_files = [p for p in pathlib.Path(self.build_folder).rglob('*') if p.is_file() and p.suffix.lower() == '.pdb']
print("PDB(s): ", pdb_files)
for pfile in pdb_files:
shutil.copy(pfile, pdb_dest)

self.copy(pattern="*", src=package_dir)

def package_info(self):
Expand Down
Loading