File tree Expand file tree Collapse file tree 2 files changed +8
-18
lines changed
Expand file tree Collapse file tree 2 files changed +8
-18
lines changed Original file line number Diff line number Diff line change @@ -46,19 +46,6 @@ set(${PROJECT_NAME}_DESCRIPTION "eProsima ${PROJECT_NAME_LARGE} library provides
4646message (STATUS "Configuring ${PROJECT_NAME_LARGE} " )
4747message (STATUS "Version: ${PROJECT_VERSION} " )
4848
49- ###############################################################################
50- # CCache on Windows on CI
51- ###############################################################################
52- if (MSVC AND CMAKE_CXX_COMPILER_LAUNCHER STREQUAL "ccache" )
53- foreach (config DEBUG RELWITHDEBINFO)
54- foreach (lang C CXX)
55- set (flags_var "CMAKE_${lang} _FLAGS_${config} " )
56- string (REPLACE "/Zi" "/Z7" ${flags_var} "${${flags_var} }" )
57- set (${flags_var} "${${flags_var} }" )
58- endforeach ()
59- endforeach ()
60- endif ()
61-
6249###############################################################################
6350# GCC colors if using CCache
6451###############################################################################
Original file line number Diff line number Diff line change @@ -148,12 +148,15 @@ if(MSVC OR MSVC_IDE)
148148 if (PDB_FILE)
149149 get_target_property (PDB_DIR ${PROJECT_NAME} PDB_OUTPUT_DIRECTORY_DEBUG)
150150 set (PDB_FILE "${PDB_DIR} /${PDB_FILE} .pdb" )
151- elseif ( NOT CMAKE_CXX_COMPILER_LAUNCHER STREQUAL "ccache" )
151+ else ( )
152152 # fallback to static lib symbols
153- get_target_property (PDB_FILE ${PROJECT_NAME} COMPILE_PDB_NAME_DEBUG)
154- if (PDB_FILE)
155- get_target_property (PDB_DIR ${PROJECT_NAME} COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG)
156- set (PDB_FILE "${PDB_DIR} /${PDB_FILE} .pdb" )
153+ get_target_property (MSVC_DEBUG_INFORMATION_FORMAT ${PROJECT_NAME} MSVC_DEBUG_INFORMATION_FORMAT)
154+ if (NOT MSVC_DEBUG_INFORMATION_FORMAT MATCHES ".*Embedded.*" )
155+ get_target_property (PDB_FILE ${PROJECT_NAME} COMPILE_PDB_NAME_DEBUG)
156+ if (PDB_FILE)
157+ get_target_property (PDB_DIR ${PROJECT_NAME} COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG)
158+ set (PDB_FILE "${PDB_DIR} /${PDB_FILE} .pdb" )
159+ endif ()
157160 endif ()
158161 endif ()
159162
You can’t perform that action at this time.
0 commit comments