From 387777ed72f4896b30ee1bedb2ce45cc1979e220 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 22 Feb 2015 20:49:30 +0100 Subject: [PATCH] Fix VTune static library dependencies Since libcommon.a is also the last library to be linked, this has the totally hacky but useful side-effect that it doesn't require people to modify CMake files for temporarily adding VTune code to other Dolphin libraries. --- CMakeLists.txt | 6 ++++-- Source/Core/Common/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78011f3db3..85a98e4c16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,8 +348,10 @@ if(VTUNE) endif() add_definitions(-DUSE_VTUNE) include_directories("${VTUNE_DIR}/include") - list(APPEND LIBS "${VTUNE_DIR}/lib64/libjitprofiling.a") - list(APPEND LIBS "${VTUNE_DIR}/lib64/libittnotify.a") + set(VTUNE_LIBRARIES + "${VTUNE_DIR}/lib64/libjitprofiling.a" + "${VTUNE_DIR}/lib64/libittnotify.a" + ) endif(VTUNE) if(ANDROID) diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index d827d389aa..95ff8b99b3 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -60,7 +60,7 @@ if(WIN32) set(SRCS ${SRCS} ExtendedTrace.cpp) endif(WIN32) -set(LIBS "${CMAKE_THREAD_LIBS_INIT}") +set(LIBS "${CMAKE_THREAD_LIBS_INIT}" ${VTUNE_LIBRARIES}) if(NOT APPLE AND NOT ANDROID) set(LIBS ${LIBS} rt) endif()