From 38cb6ba6dcf8933dfe2c226615fa184a8bdf38e7 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 5 Feb 2016 10:51:56 -0600 Subject: [PATCH] Fix a bug in the Common CMakeLists file We were overwriting the LIBS variable. Effectively dropping libiconv from the libs. --- Source/Core/Common/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 21fdd2104e..05bc6621e7 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -42,7 +42,7 @@ else() Logging/ConsoleListenerNix.cpp) endif() -set(LIBS enet) +list(APPEND LIBS enet) if(_M_ARM_64) set(SRCS ${SRCS} Arm64Emitter.cpp @@ -60,13 +60,13 @@ else() endif() endif() -set(LIBS "${CMAKE_THREAD_LIBS_INIT}" ${VTUNE_LIBRARIES}) +list(APPEND LIBS "${CMAKE_THREAD_LIBS_INIT}" ${VTUNE_LIBRARIES}) if(NOT APPLE AND NOT ANDROID) - set(LIBS ${LIBS} rt) + list(APPEND LIBS rt) endif() # OpenGL Interface -set(SRCS ${SRCS} +set(SRCS ${SRCS} GL/GLUtil.cpp GL/GLExtensions/GLExtensions.cpp GL/GLInterface/GLInterface.cpp)