mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	Merge pull request #3264 from lioncash/cmake-target
CMakeLists: Derive the source directory grouping from targets themselves
This commit is contained in:
		
						commit
						4695f12a08
					
				
					 14 changed files with 735 additions and 767 deletions
				
			
		|  | @ -24,78 +24,73 @@ if ($ENV{CI}) | |||
| endif() | ||||
| configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/scm_rev.cpp" @ONLY) | ||||
| 
 | ||||
| set(SRCS | ||||
|             break_points.cpp | ||||
|             file_util.cpp | ||||
|             hash.cpp | ||||
|             logging/filter.cpp | ||||
|             logging/text_formatter.cpp | ||||
|             logging/backend.cpp | ||||
|             memory_util.cpp | ||||
|             microprofile.cpp | ||||
|             misc.cpp | ||||
|             param_package.cpp | ||||
|             scm_rev.cpp | ||||
|             string_util.cpp | ||||
|             telemetry.cpp | ||||
|             thread.cpp | ||||
|             timer.cpp | ||||
|             ) | ||||
| 
 | ||||
| set(HEADERS | ||||
|             alignment.h | ||||
|             assert.h | ||||
|             bit_field.h | ||||
|             bit_set.h | ||||
|             break_points.h | ||||
|             chunk_file.h | ||||
|             code_block.h | ||||
|             color.h | ||||
|             common_funcs.h | ||||
|             common_paths.h | ||||
|             common_types.h | ||||
|             file_util.h | ||||
|             hash.h | ||||
|             linear_disk_cache.h | ||||
|             logging/text_formatter.h | ||||
|             logging/filter.h | ||||
|             logging/log.h | ||||
|             logging/backend.h | ||||
|             math_util.h | ||||
|             memory_util.h | ||||
|             microprofile.h | ||||
|             microprofileui.h | ||||
|             param_package.h | ||||
|             platform.h | ||||
|             quaternion.h | ||||
|             scm_rev.h | ||||
|             scope_exit.h | ||||
|             string_util.h | ||||
|             swap.h | ||||
|             synchronized_wrapper.h | ||||
|             telemetry.h | ||||
|             thread.h | ||||
|             thread_queue_list.h | ||||
|             threadsafe_queue.h | ||||
|             timer.h | ||||
|             vector_math.h | ||||
|             ) | ||||
| add_library(common STATIC | ||||
|     alignment.h | ||||
|     assert.h | ||||
|     bit_field.h | ||||
|     bit_set.h | ||||
|     break_points.cpp | ||||
|     break_points.h | ||||
|     chunk_file.h | ||||
|     code_block.h | ||||
|     color.h | ||||
|     common_funcs.h | ||||
|     common_paths.h | ||||
|     common_types.h | ||||
|     file_util.cpp | ||||
|     file_util.h | ||||
|     hash.cpp | ||||
|     hash.h | ||||
|     linear_disk_cache.h | ||||
|     logging/backend.cpp | ||||
|     logging/backend.h | ||||
|     logging/filter.cpp | ||||
|     logging/filter.h | ||||
|     logging/log.h | ||||
|     logging/text_formatter.cpp | ||||
|     logging/text_formatter.h | ||||
|     math_util.h | ||||
|     memory_util.cpp | ||||
|     memory_util.h | ||||
|     microprofile.cpp | ||||
|     microprofile.h | ||||
|     microprofileui.h | ||||
|     misc.cpp | ||||
|     param_package.cpp | ||||
|     param_package.h | ||||
|     platform.h | ||||
|     quaternion.h | ||||
|     scm_rev.cpp | ||||
|     scm_rev.h | ||||
|     scope_exit.h | ||||
|     string_util.cpp | ||||
|     string_util.h | ||||
|     swap.h | ||||
|     synchronized_wrapper.h | ||||
|     telemetry.cpp | ||||
|     telemetry.h | ||||
|     thread.cpp | ||||
|     thread.h | ||||
|     thread_queue_list.h | ||||
|     threadsafe_queue.h | ||||
|     timer.cpp | ||||
|     timer.h | ||||
|     vector_math.h | ||||
| ) | ||||
| 
 | ||||
| if(ARCHITECTURE_x86_64) | ||||
|     set(SRCS ${SRCS} | ||||
|     target_sources(common | ||||
|         PRIVATE | ||||
|             x64/cpu_detect.cpp | ||||
|             ) | ||||
| 
 | ||||
|     set(HEADERS ${HEADERS} | ||||
|             x64/cpu_detect.h | ||||
|             x64/xbyak_abi.h | ||||
|             x64/xbyak_util.h | ||||
|             ) | ||||
|     ) | ||||
| endif() | ||||
| 
 | ||||
| create_directory_groups(${SRCS} ${HEADERS}) | ||||
| create_target_directory_groups(common) | ||||
| 
 | ||||
| add_library(common STATIC ${SRCS} ${HEADERS}) | ||||
| target_link_libraries(common PUBLIC Boost::boost microprofile) | ||||
| if (ARCHITECTURE_x86_64) | ||||
|     target_link_libraries(common PRIVATE xbyak) | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue