diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-03-02 11:51:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-02 11:51:06 +0100 |
| commit | 7982ba120ffb2ca04006d040af33080ad5300404 (patch) | |
| tree | 4e67e179feedc96863381c2a48a200aedd9d784d /Source/Core/Common | |
| parent | 521a777ade79e1f8d7c49f521c7cc060ef64b7e3 (diff) | |
| parent | ee61bd6f2e4db8df8e92be6f92c02b808aa92234 (diff) | |
Merge pull request #4995 from lioncash/normalize
CMakeLists: Normalize whitespace
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/CMakeLists.txt | 172 |
1 files changed, 89 insertions, 83 deletions
diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index fbb5961e2e..c894a297c3 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -1,117 +1,123 @@ -set(SRCS Analytics.cpp - CDUtils.cpp - ColorUtil.cpp - Config/Config.cpp - Config/Layer.cpp - Config/Section.cpp - ENetUtil.cpp - FileSearch.cpp - FileUtil.cpp - GekkoDisassembler.cpp - Hash.cpp - IniFile.cpp - JitRegister.cpp - MathUtil.cpp - MemArena.cpp - MemoryUtil.cpp - Misc.cpp - MsgHandler.cpp - NandPaths.cpp - Network.cpp - PcapFile.cpp - PerformanceCounter.cpp - Profiler.cpp - SettingsHandler.cpp - SDCardUtil.cpp - StringUtil.cpp - SymbolDB.cpp - SysConf.cpp - Thread.cpp - Timer.cpp - TraversalClient.cpp - Version.cpp - x64ABI.cpp - x64Emitter.cpp - MD5.cpp - Crypto/AES.cpp - Crypto/bn.cpp - Crypto/ec.cpp - Logging/LogManager.cpp) +set(SRCS + Analytics.cpp + CDUtils.cpp + ColorUtil.cpp + Config/Config.cpp + Config/Layer.cpp + Config/Section.cpp + ENetUtil.cpp + FileSearch.cpp + FileUtil.cpp + GekkoDisassembler.cpp + Hash.cpp + IniFile.cpp + JitRegister.cpp + MathUtil.cpp + MemArena.cpp + MemoryUtil.cpp + Misc.cpp + MsgHandler.cpp + NandPaths.cpp + Network.cpp + PcapFile.cpp + PerformanceCounter.cpp + Profiler.cpp + SettingsHandler.cpp + SDCardUtil.cpp + StringUtil.cpp + SymbolDB.cpp + SysConf.cpp + Thread.cpp + Timer.cpp + TraversalClient.cpp + Version.cpp + x64ABI.cpp + x64Emitter.cpp + MD5.cpp + Crypto/AES.cpp + Crypto/bn.cpp + Crypto/ec.cpp + Logging/LogManager.cpp +) if(LIBUSB_FOUND) - set(LIBS ${LIBS} ${LIBUSB_LIBRARIES}) - set(SRCS ${SRCS} LibusbContext.cpp) + set(LIBS ${LIBS} ${LIBUSB_LIBRARIES}) + set(SRCS ${SRCS} LibusbContext.cpp) endif(LIBUSB_FOUND) if(ANDROID) - set(SRCS ${SRCS} - Logging/ConsoleListenerDroid.cpp) + set(SRCS ${SRCS} + Logging/ConsoleListenerDroid.cpp) elseif(WIN32) - set(SRCS ${SRCS} - Logging/ConsoleListenerWin.cpp) + set(SRCS ${SRCS} + Logging/ConsoleListenerWin.cpp) else() - set(SRCS ${SRCS} - Logging/ConsoleListenerNix.cpp) + set(SRCS ${SRCS} + Logging/ConsoleListenerNix.cpp) endif() list(APPEND LIBS enet ${CURL_LIBRARIES}) if(_M_ARM_64) - set(SRCS ${SRCS} - Arm64Emitter.cpp - ArmCPUDetect.cpp - GenericFPURoundMode.cpp) + set(SRCS ${SRCS} + Arm64Emitter.cpp + ArmCPUDetect.cpp + GenericFPURoundMode.cpp + ) else() - if(_M_X86) #X86 - set(SRCS ${SRCS} - x64FPURoundMode.cpp - x64CPUDetect.cpp) - else() # Generic - set(SRCS ${SRCS} - GenericFPURoundMode.cpp - GenericCPUDetect.cpp) - endif() + if(_M_X86) #X86 + set(SRCS ${SRCS} + x64FPURoundMode.cpp + x64CPUDetect.cpp + ) + else() # Generic + set(SRCS ${SRCS} + GenericFPURoundMode.cpp + GenericCPUDetect.cpp + ) + endif() endif() list(APPEND LIBS "${CMAKE_THREAD_LIBS_INIT}" ${VTUNE_LIBRARIES}) # OpenGL Interface set(SRCS ${SRCS} - GL/GLUtil.cpp - GL/GLExtensions/GLExtensions.cpp - GL/GLInterface/GLInterface.cpp) + GL/GLUtil.cpp + GL/GLExtensions/GLExtensions.cpp + GL/GLInterface/GLInterface.cpp +) if(USE_EGL) - set(SRCS ${SRCS} GL/GLInterface/EGL.cpp) - if(ANDROID) - set(SRCS ${SRCS} GL/GLInterface/EGLAndroid.cpp) - elseif(USE_X11) - set(SRCS ${SRCS} GL/GLInterface/EGLX11.cpp) - endif() - set(LIBS ${LIBS} EGL) + set(SRCS ${SRCS} GL/GLInterface/EGL.cpp) + if(ANDROID) + set(SRCS ${SRCS} GL/GLInterface/EGLAndroid.cpp) + elseif(USE_X11) + set(SRCS ${SRCS} GL/GLInterface/EGLX11.cpp) + endif() + set(LIBS ${LIBS} EGL) endif() if(WIN32) - set(SRCS ${SRCS} GL/GLInterface/WGL.cpp) + set(SRCS ${SRCS} GL/GLInterface/WGL.cpp) elseif(APPLE) - set(SRCS ${SRCS} GL/GLInterface/AGL.mm) + set(SRCS ${SRCS} GL/GLInterface/AGL.mm) elseif(USE_X11) - if (NOT USE_EGL) - set(SRCS ${SRCS} GL/GLInterface/GLX.cpp) - # GLX has a hard dependency on libGL. - # Make sure to link to it if using GLX. - set(LIBS ${LIBS} ${OPENGL_LIBRARIES}) - endif() - set(SRCS ${SRCS} GL/GLInterface/X11_Util.cpp) - set(LIBS ${LIBS} ${XRANDR_LIBRARIES}) + if (NOT USE_EGL) + set(SRCS ${SRCS} GL/GLInterface/GLX.cpp) + # GLX has a hard dependency on libGL. + # Make sure to link to it if using GLX. + set(LIBS ${LIBS} ${OPENGL_LIBRARIES}) + endif() + set(SRCS ${SRCS} GL/GLInterface/X11_Util.cpp) + set(LIBS ${LIBS} ${XRANDR_LIBRARIES}) endif() if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(LIBS ${LIBS} dl) + set(LIBS ${LIBS} dl) endif() add_dolphin_library(common "${SRCS}" "${LIBS}") if(UNIX) - # Posix networking code needs to be fixed for Windows - add_executable(traversal_server TraversalServer.cpp) + # Posix networking code needs to be fixed for Windows + add_executable(traversal_server TraversalServer.cpp) endif() |
