From cabe9cf995d08603e0bebb1379c9e2da8112cef7 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sat, 24 Jun 2023 01:48:13 +0200 Subject: [PATCH] build: Fixed PDB generation again --- cmake/build_helpers.cmake | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index 65d60e75f..23ec40307 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -590,12 +590,12 @@ function(generatePDBs) set(PDBS_TO_GENERATE main libimhex ${PLUGINS}) add_custom_target(pdbs) foreach (PDB ${PDBS_TO_GENERATE}) - if (PDB STREQUAL "libimhex") - set(GENERATED_PDB libimhex.dll) - elseif (PDB STREQUAL "main") - set(GENERATED_PDB imhex.exe) + if (PDB STREQUAL "main") + set(GENERATED_PDB imhex) + elseif (PDB STREQUAL "libimhex") + set(GENERATED_PDB libimhex) else () - set(GENERATED_PDB plugins/${PDB}.hexplug) + set(GENERATED_PDB plugins/${PDB}) endif () add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${GENERATED_PDB}.pdb @@ -603,14 +603,12 @@ function(generatePDBs) COMMAND (${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/${GENERATED_PDB}.pdb && ${cv2pdb_SOURCE_DIR}/cv2pdb64.exe - $ - $.stripped) || (exit 0) + $) || (exit 0) DEPENDS $ COMMAND_EXPAND_LISTS) - add_custom_target(${PDB}_pdb DEPENDS ${CMAKE_BINARY_DIR}/${GENERATED_PDB}.pdb) - add_dependencies(imhex_all ${PDB}_pdb) - install(FILES $.pdb DESTINATION ".") + target_sources(imhex_all PRIVATE ${CMAKE_BINARY_DIR}/${GENERATED_PDB}.pdb) + install(FILES ${CMAKE_BINARY_DIR}/${GENERATED_PDB}.pdb DESTINATION ".") endforeach ()