Merge pull request #6554 from lioncash/videocommon-cmake

VideoCommon/CMakeLists: Migrate off add_dolphin_library
dolphin-emu · Mar 28, 2018 · a81c6b0 · a81c6b0
2 parents c288500 + fd7ac0d
commit a81c6b0
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(SRCS
+add_library(videocommon
   AbstractFramebuffer.cpp
   AbstractStagingTexture.cpp
   AbstractTexture.cpp
@@ -59,21 +59,29 @@ set(SRCS
   XFStructs.cpp
 )
 
-set(LIBS
+target_link_libraries(videocommon
+PUBLIC
   core
+PRIVATE
   png
 )
 
 if(_M_X86)
-  set(SRCS ${SRCS} TextureDecoder_x64.cpp VertexLoaderX64.cpp)
+  target_sources(videocommon PRIVATE
+    TextureDecoder_x64.cpp
+    VertexLoaderX64.cpp
+  )
 elseif(_M_ARM_64)
-  set(SRCS ${SRCS} VertexLoaderARM64.cpp TextureDecoder_Generic.cpp)
+  target_sources(videocommon PRIVATE
+    VertexLoaderARM64.cpp
+    TextureDecoder_Generic.cpp
+  )
 else()
-  set(SRCS ${SRCS} TextureDecoder_Generic.cpp)
+  target_sources(videocommon PRIVATE
+    TextureDecoder_Generic.cpp
+  )
 endif()
 
-add_dolphin_library(videocommon "${SRCS}" "${LIBS}")
-
 if(FFmpeg_FOUND)
   target_sources(videocommon PRIVATE AVIDump.cpp)
   target_link_libraries(videocommon PRIVATE