Skip to content

Commit

Permalink
Common/CMakeLists: Specify headers alongside source files
Browse files Browse the repository at this point in the history
Allows these files to show up as part of the project when generating IDE
builds from CMake.
  • Loading branch information
lioncash committed May 31, 2019
1 parent 5ffbec6 commit 48b82e8
Showing 1 changed file with 111 additions and 6 deletions.
117 changes: 111 additions & 6 deletions Source/Core/Common/CMakeLists.txt
@@ -1,52 +1,131 @@
add_library(common add_library(common
Analytics.cpp Analytics.cpp
Analytics.h
Assert.h
Atomic.h
BitField.h
BitSet.h
BitUtils.h
BlockingLoop.h
CDUtils.cpp CDUtils.cpp
CDUtils.h
ChunkFile.h
CodeBlock.h
ColorUtil.cpp ColorUtil.cpp
ColorUtil.h
Common.h
CommonFuncs.cpp CommonFuncs.cpp
CommonFuncs.h
CommonPaths.h
CommonTypes.h
Compiler.h
Config/Config.cpp Config/Config.cpp
Config/Config.h
Config/ConfigInfo.cpp Config/ConfigInfo.cpp
Config/ConfigInfo.h
Config/Enums.h
Config/Layer.cpp Config/Layer.cpp
Config/Layer.h
CPUDetect.h
Crypto/AES.cpp Crypto/AES.cpp
Crypto/AES.h
Crypto/bn.cpp Crypto/bn.cpp
Crypto/bn.h
Crypto/ec.cpp Crypto/ec.cpp
Crypto/ec.h
Debug/MemoryPatches.cpp Debug/MemoryPatches.cpp
Debug/MemoryPatches.h
Debug/Watches.cpp Debug/Watches.cpp
Debug/Watches.h
DebugInterface.h
DynamicLibrary.cpp DynamicLibrary.cpp
DynamicLibrary.h
ENetUtil.cpp ENetUtil.cpp
ENetUtil.h
Event.h
File.cpp File.cpp
File.h
FileSearch.cpp FileSearch.cpp
FileSearch.h
FileUtil.cpp FileUtil.cpp
FileUtil.h
FixedSizeQueue.h
Flag.h
FloatUtils.cpp FloatUtils.cpp
FloatUtils.h
FPURoundMode.h
GekkoDisassembler.cpp GekkoDisassembler.cpp
GekkoDisassembler.h
Hash.cpp Hash.cpp
Hash.h
HttpRequest.cpp HttpRequest.cpp
HttpRequest.h
Image.cpp Image.cpp
Image.h
IniFile.cpp IniFile.cpp
IniFile.h
JitRegister.cpp JitRegister.cpp
JitRegister.h
Lazy.h
LinearDiskCache.h
Logging/ConsoleListener.h
Logging/Log.h
Logging/LogManager.cpp Logging/LogManager.cpp
Logging/LogManager.h
MathUtil.cpp MathUtil.cpp
MathUtil.h
Matrix.cpp Matrix.cpp
Matrix.h
MD5.cpp MD5.cpp
MD5.h
MemArena.cpp MemArena.cpp
MemArena.h
MemoryUtil.cpp MemoryUtil.cpp
MemoryUtil.h
MsgHandler.cpp MsgHandler.cpp
MsgHandler.h
NandPaths.cpp NandPaths.cpp
NandPaths.h
Network.cpp Network.cpp
Network.h
PcapFile.cpp PcapFile.cpp
PcapFile.h
PerformanceCounter.cpp PerformanceCounter.cpp
PerformanceCounter.h
Profiler.cpp Profiler.cpp
Profiler.h
QoSSession.cpp QoSSession.cpp
QoSSession.h
Random.cpp Random.cpp
Random.h
Result.h
ScopeGuard.h
SDCardUtil.cpp SDCardUtil.cpp
SDCardUtil.h
Semaphore.h
SFMLHelper.cpp SFMLHelper.cpp
SFMLHelper.h
SettingsHandler.cpp SettingsHandler.cpp
SettingsHandler.h
SPSCQueue.h
StringUtil.cpp StringUtil.cpp
StringUtil.h
SymbolDB.cpp SymbolDB.cpp
SymbolDB.h
Thread.cpp Thread.cpp
Thread.h
Timer.cpp Timer.cpp
Timer.h
TraversalClient.cpp TraversalClient.cpp
TraversalClient.h
TraversalProto.h
UPnP.cpp UPnP.cpp
UPnP.h
VariantUtil.h
Version.cpp Version.cpp
Version.h
WindowSystemInfo.h
WorkQueueThread.h
) )


target_link_libraries(common target_link_libraries(common
Expand Down Expand Up @@ -82,11 +161,13 @@ endif()
if(ANDROID) if(ANDROID)
target_sources(common PRIVATE target_sources(common PRIVATE
AndroidAnalytics.cpp AndroidAnalytics.cpp
AndroidAnalytics.h
Logging/ConsoleListenerDroid.cpp Logging/ConsoleListenerDroid.cpp
) )
elseif(WIN32) elseif(WIN32)
target_sources(common PRIVATE target_sources(common PRIVATE
LdrWatcher.cpp LdrWatcher.cpp
LdrWatcher.h
Logging/ConsoleListenerWin.cpp Logging/ConsoleListenerWin.cpp
) )
else() else()
Expand All @@ -98,16 +179,21 @@ endif()
if(_M_ARM_64) if(_M_ARM_64)
target_sources(common PRIVATE target_sources(common PRIVATE
Arm64Emitter.cpp Arm64Emitter.cpp
Arm64Emitter.h
ArmCommon.h
ArmCPUDetect.cpp ArmCPUDetect.cpp
GenericFPURoundMode.cpp GenericFPURoundMode.cpp
) )
else() else()
if(_M_X86) #X86 if(_M_X86) #X86
target_sources(common PRIVATE target_sources(common PRIVATE
x64ABI.cpp x64ABI.cpp
x64ABI.h
x64Emitter.cpp x64Emitter.cpp
x64Emitter.h
x64FPURoundMode.cpp x64FPURoundMode.cpp
x64CPUDetect.cpp x64CPUDetect.cpp
x64Reg.h
) )
else() # Generic else() # Generic
target_sources(common PRIVATE target_sources(common PRIVATE
Expand All @@ -119,17 +205,29 @@ endif()


# OpenGL Interface # OpenGL Interface
target_sources(common PRIVATE target_sources(common PRIVATE
GL/GLContext.cpp
GL/GLContext.h
GL/GLUtil.cpp GL/GLUtil.cpp
GL/GLUtil.h
GL/GLExtensions/GLExtensions.cpp GL/GLExtensions/GLExtensions.cpp
GL/GLContext.cpp GL/GLExtensions/GLExtensions.h
) )


if(ENABLE_EGL AND EGL_FOUND) if(ENABLE_EGL AND EGL_FOUND)
target_sources(common PRIVATE GL/GLInterface/EGL.cpp) target_sources(common PRIVATE
GL/GLInterface/EGL.cpp
GL/GLInterface/EGL.h
)
if(ANDROID) if(ANDROID)
target_sources(common PRIVATE GL/GLInterface/EGLAndroid.cpp) target_sources(common PRIVATE
GL/GLInterface/EGLAndroid.cpp
GL/GLInterface/EGLAndroid.h
)
elseif(ENABLE_X11 AND X11_FOUND) elseif(ENABLE_X11 AND X11_FOUND)
target_sources(common PRIVATE GL/GLInterface/EGLX11.cpp) target_sources(common PRIVATE
GL/GLInterface/EGLX11.cpp
GL/GLInterface/EGLX11.h
)
endif() endif()
target_include_directories(common PRIVATE ${EGL_INCLUDE_DIRS}) target_include_directories(common PRIVATE ${EGL_INCLUDE_DIRS})
target_link_libraries(common PUBLIC ${EGL_LIBRARIES}) target_link_libraries(common PUBLIC ${EGL_LIBRARIES})
Expand All @@ -139,13 +237,20 @@ if(WIN32)
target_sources(common PRIVATE target_sources(common PRIVATE
CompatPatches.cpp CompatPatches.cpp
GL/GLInterface/WGL.cpp GL/GLInterface/WGL.cpp
GL/GLInterface/WGL.h
) )
elseif(APPLE) elseif(APPLE)
target_sources(common PRIVATE GL/GLInterface/AGL.mm) target_sources(common PRIVATE
GL/GLInterface/AGL.h
GL/GLInterface/AGL.mm
)
elseif(ENABLE_X11 AND X11_FOUND) elseif(ENABLE_X11 AND X11_FOUND)
target_sources(common PRIVATE target_sources(common PRIVATE
GL/GLX11Window.cpp GL/GLX11Window.cpp
GL/GLInterface/GLX.cpp) GL/GLX11Window.h
GL/GLInterface/GLX.cpp
GL/GLInterface/GLX.h
)


# GLX has a hard dependency on libGL. # GLX has a hard dependency on libGL.
# Make sure to link to it if using GLX. # Make sure to link to it if using GLX.
Expand Down

0 comments on commit 48b82e8

Please sign in to comment.