diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 0f5a216d5e..d9fd43255f 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -42,6 +42,7 @@ endif(WIN32) include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src") add_library(common STATIC ${SRCS}) +target_link_libraries(common ${CMAKE_DL_LIBS}) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") add_definitions(-fPIC) endif() diff --git a/Source/Core/DebuggerUICommon/CMakeLists.txt b/Source/Core/DebuggerUICommon/CMakeLists.txt index 0f4d9ac30e..4b88b6a162 100644 --- a/Source/Core/DebuggerUICommon/CMakeLists.txt +++ b/Source/Core/DebuggerUICommon/CMakeLists.txt @@ -3,6 +3,7 @@ set(SRCS Src/CodeView.cpp Src/MemoryView.cpp) add_library(debugger_ui_util STATIC ${SRCS}) +target_link_libraries(debugger_ui_util ${wxWidgets_LIBRARIES}) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") add_definitions(-fPIC) endif() diff --git a/Source/Plugins/Plugin_DSP_HLE/CMakeLists.txt b/Source/Plugins/Plugin_DSP_HLE/CMakeLists.txt index 3ff95fb249..2121528768 100644 --- a/Source/Plugins/Plugin_DSP_HLE/CMakeLists.txt +++ b/Source/Plugins/Plugin_DSP_HLE/CMakeLists.txt @@ -21,11 +21,7 @@ if(wxWidgets_FOUND) endif(wxWidgets_FOUND) add_library(Plugin_DSP_HLE MODULE ${SRCS}) -if(wxWidgets_FOUND) - target_link_libraries(Plugin_DSP_HLE common audiocommon ${wxWidgets_LIBRARIES}) -else(wxWidgets_FOUND) - target_link_libraries(Plugin_DSP_HLE common audiocommon) -endif(wxWidgets_FOUND) +target_link_libraries(Plugin_DSP_HLE common audiocommon ${wxWidgets_LIBRARIES}) install(TARGETS Plugin_DSP_HLE LIBRARY DESTINATION ${plugindir} RUNTIME DESTINATION ${plugindir}) diff --git a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt index 60a585534c..8679e53353 100644 --- a/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt +++ b/Source/Plugins/Plugin_VideoOGL/CMakeLists.txt @@ -23,8 +23,7 @@ set(LIBS videocommon if(wxWidgets_FOUND) set(SRCS ${SRCS} Src/Debugger/Debugger.cpp) - set(LIBS videouicommon ${LIBS}) - set(LIBS ${LIBS} ${wxWidgets_LIBRARIES}) + set(LIBS videouicommon ${LIBS} ${wxWidgets_LIBRARIES}) endif(wxWidgets_FOUND) if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND NOT wxWidgets_FOUND)