Skip to content

Commit

Permalink
CMakeLists: Normalize whitespace
Browse files Browse the repository at this point in the history
Normalizes tabs to spaces to follow our codebase's indentation style.
  • Loading branch information
lioncash committed Mar 1, 2017
1 parent e375c96 commit ee61bd6
Show file tree
Hide file tree
Showing 17 changed files with 1,384 additions and 1,353 deletions.
1,080 changes: 540 additions & 540 deletions CMakeLists.txt

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-D__STDC_CONSTANT_MACROS)

macro(add_dolphin_library lib srcs libs)
add_library(${lib} STATIC ${srcs})
target_link_libraries(${lib} PUBLIC ${libs})
add_library(${lib} STATIC ${srcs})
target_link_libraries(${lib} PUBLIC ${libs})
endmacro()

add_subdirectory(Core)
if (ANDROID)
add_subdirectory(Android/jni)
add_subdirectory(Android/jni)
endif()
add_subdirectory(UnitTests)

if (DSPTOOL)
add_subdirectory(DSPTool)
add_subdirectory(DSPTool)
endif()

# TODO: Add DSPSpy. Preferably make it option() and cpack component
2 changes: 1 addition & 1 deletion Source/Core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ add_subdirectory(VideoCommon)
add_subdirectory(VideoBackends)

if(ENABLE_QT2)
add_subdirectory(DolphinQt2)
add_subdirectory(DolphinQt2)
endif()
172 changes: 89 additions & 83 deletions Source/Core/Common/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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()
Loading

0 comments on commit ee61bd6

Please sign in to comment.