Skip to content

Added x86/x64 DIA SDK support, MSVC unicode support, and better message to check that VSINSTALLDIR is defined. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fmilano wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added x86/x64 DIA SDK support, MSVC unicode support, and better message to check that VSINSTALLDIR is defined. #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions mendeley/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ cmake_minimum_required(VERSION 2.8)
set(BREAKPAD_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src)

if(WIN32)
ADD_DEFINITIONS(-DUNICODE)
ADD_DEFINITIONS(-D_UNICODE)
add_definitions(-D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS)
set(DEBUG_ACCESS_SDK_DIR "$ENV{VSINSTALLDIR}/DIA SDK")
if (NOT (EXISTS "${DEBUG_ACCESS_SDK_DIR}"))
# The Debug Access SDK is required to build the dump_syms tool.
# It ships with the pro versions of Visual Studio 2008 and 2010 but not
# the express versions. It is available separately as part of the Windows SDK
# however.
message(FATAL_ERROR "Debug Access SDK not found in ${DEBUG_ACCESS_SDK_DIR}")
message(FATAL_ERROR "Debug Access SDK not found in ${DEBUG_ACCESS_SDK_DIR}. Please check that the VSINSTALLDIR environment variable points to your Visual Studio installation directory.")
endif()
include_directories(${BREAKPAD_SRC_DIR} ${BREAKPAD_SRC_DIR}/third_party/windows/include ${DEBUG_ACCESS_SDK_DIR}/include)
set(BREAKPADCOMMON_LIB_SRCS
Expand All @@ -28,7 +30,7 @@ if(WIN32)
${CLIENT_SRC_DIR}/crash_generation/crash_generation_server.cc
${CLIENT_SRC_DIR}/crash_generation/minidump_generator.cc
)
ide_group_sources("${BREAKPAD_LIB_SRCS}")
source_group("Sources" FILES ${BREAKPAD_LIB_SRCS})

set(DUMPSYMS_SRCS
# pdb_source_line_writer.cc is linked into the `dump_syms` target rather than
Expand All @@ -38,8 +40,13 @@ if(WIN32)
${BREAKPAD_SRC_DIR}/tools/windows/dump_syms/dump_syms.cc
)

find_library(DIA_SDK_GUID_LIB diaguids PATHS ${DEBUG_ACCESS_SDK_DIR}/lib)
set(DUMPSYMS_LIBS ${DIA_SDK_GUID_LIB})
if(NOT "${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
find_library(DIA_SDK_GUID_LIB diaguids PATHS ${DEBUG_ACCESS_SDK_DIR}/lib)
else()
find_library(DIA_SDK_GUID_LIB diaguids PATHS ${DEBUG_ACCESS_SDK_DIR}/lib/amd64)
endif()

set(DUMPSYMS_LIBS ${DIA_SDK_GUID_LIB})
elseif(APPLE)
set(CLIENT_SRC_DIR ${BREAKPAD_SRC_DIR}/client/mac)
include_directories(${BREAKPAD_SRC_DIR} ${BREAKPAD_SRC_DIR}/third_party/mac/include)
Expand Down