Merge pull request #3264 from lioncash/cmake-target

CMakeLists: Derive the source directory grouping from targets themselves
2017-12-12 14:34:51 -05:00 · 2017-12-12 14:34:51 -05:00 · 4695f12a08
commit 4695f12a08
parent b4bb74a101 ab021d163e
14 changed files with 735 additions and 767 deletions
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@ -1,88 +1,85 @@
-set(SRCS
-            command_processor.cpp
-            debug_utils/debug_utils.cpp
-            geometry_pipeline.cpp
-            pica.cpp
-            primitive_assembly.cpp
-            regs.cpp
-            renderer_base.cpp
-            renderer_opengl/gl_rasterizer.cpp
-            renderer_opengl/gl_rasterizer_cache.cpp
-            renderer_opengl/gl_shader_gen.cpp
-            renderer_opengl/gl_shader_util.cpp
-            renderer_opengl/gl_state.cpp
-            renderer_opengl/renderer_opengl.cpp
-            shader/shader.cpp
-            shader/shader_interpreter.cpp
-            swrasterizer/clipper.cpp
-            swrasterizer/framebuffer.cpp
-            swrasterizer/lighting.cpp
-            swrasterizer/proctex.cpp
-            swrasterizer/rasterizer.cpp
-            swrasterizer/swrasterizer.cpp
-            swrasterizer/texturing.cpp
-            texture/etc1.cpp
-            texture/texture_decode.cpp
-            vertex_loader.cpp
-            video_core.cpp
-            )
-
-set(HEADERS
-            command_processor.h
-            debug_utils/debug_utils.h
-            geometry_pipeline.h
-            gpu_debugger.h
-            pica.h
-            pica_state.h
-            pica_types.h
-            primitive_assembly.h
-            rasterizer_interface.h
-            regs.h
-            regs_framebuffer.h
-            regs_lighting.h
-            regs_pipeline.h
-            regs_rasterizer.h
-            regs_shader.h
-            regs_texturing.h
-            renderer_base.h
-            renderer_opengl/gl_rasterizer.h
-            renderer_opengl/gl_rasterizer_cache.h
-            renderer_opengl/gl_resource_manager.h
-            renderer_opengl/gl_shader_gen.h
-            renderer_opengl/gl_shader_util.h
-            renderer_opengl/gl_state.h
-            renderer_opengl/pica_to_gl.h
-            renderer_opengl/renderer_opengl.h
-            shader/debug_data.h
-            shader/shader.h
-            shader/shader_interpreter.h
-            swrasterizer/clipper.h
-            swrasterizer/framebuffer.h
-            swrasterizer/lighting.h
-            swrasterizer/proctex.h
-            swrasterizer/rasterizer.h
-            swrasterizer/swrasterizer.h
-            swrasterizer/texturing.h
-            texture/etc1.h
-            texture/texture_decode.h
-            utils.h
-            vertex_loader.h
-            video_core.h
-            )
+add_library(video_core STATIC
+    command_processor.cpp
+    command_processor.h
+    debug_utils/debug_utils.cpp
+    debug_utils/debug_utils.h
+    geometry_pipeline.cpp
+    geometry_pipeline.h
+    gpu_debugger.h
+    pica.cpp
+    pica.h
+    pica_state.h
+    pica_types.h
+    primitive_assembly.cpp
+    primitive_assembly.h
+    rasterizer_interface.h
+    regs.cpp
+    regs.h
+    regs_framebuffer.h
+    regs_lighting.h
+    regs_pipeline.h
+    regs_rasterizer.h
+    regs_shader.h
+    regs_texturing.h
+    renderer_base.cpp
+    renderer_base.h
+    renderer_opengl/gl_rasterizer.cpp
+    renderer_opengl/gl_rasterizer.h
+    renderer_opengl/gl_rasterizer_cache.cpp
+    renderer_opengl/gl_rasterizer_cache.h
+    renderer_opengl/gl_resource_manager.h
+    renderer_opengl/gl_shader_gen.cpp
+    renderer_opengl/gl_shader_gen.h
+    renderer_opengl/gl_shader_util.cpp
+    renderer_opengl/gl_shader_util.h
+    renderer_opengl/gl_state.cpp
+    renderer_opengl/gl_state.h
+    renderer_opengl/pica_to_gl.h
+    renderer_opengl/renderer_opengl.cpp
+    renderer_opengl/renderer_opengl.h
+    shader/debug_data.h
+    shader/shader.cpp
+    shader/shader.h
+    shader/shader_interpreter.cpp
+    shader/shader_interpreter.h
+    swrasterizer/clipper.cpp
+    swrasterizer/clipper.h
+    swrasterizer/framebuffer.cpp
+    swrasterizer/framebuffer.h
+    swrasterizer/lighting.cpp
+    swrasterizer/lighting.h
+    swrasterizer/proctex.cpp
+    swrasterizer/proctex.h
+    swrasterizer/rasterizer.cpp
+    swrasterizer/rasterizer.h
+    swrasterizer/swrasterizer.cpp
+    swrasterizer/swrasterizer.h
+    swrasterizer/texturing.cpp
+    swrasterizer/texturing.h
+    texture/etc1.cpp
+    texture/etc1.h
+    texture/texture_decode.cpp
+    texture/texture_decode.h
+    utils.h
+    vertex_loader.cpp
+    vertex_loader.h
+    video_core.cpp
+    video_core.h
+)

 if(ARCHITECTURE_x86_64)
-    set(SRCS ${SRCS}
+    target_sources(video_core
+        PRIVATE
            shader/shader_jit_x64.cpp
-            shader/shader_jit_x64_compiler.cpp)
+            shader/shader_jit_x64_compiler.cpp

-    set(HEADERS ${HEADERS}
            shader/shader_jit_x64.h
-            shader/shader_jit_x64_compiler.h)
+            shader/shader_jit_x64_compiler.h
+    )
 endif()

-create_directory_groups(${SRCS} ${HEADERS})
+create_target_directory_groups(video_core)

-add_library(video_core STATIC ${SRCS} ${HEADERS})
 target_link_libraries(video_core PUBLIC common core)
 target_link_libraries(video_core PRIVATE glad nihstro-headers)