From 99d59c6775c415f5ff43ec68876b5c75cf4ce91d Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Thu, 21 Nov 2024 21:15:58 +0000 Subject: [PATCH] citra-room: Updated filename and cmake target name formatting for consistency --- CMakeLists.txt | 2 +- src/citra_room/CMakeLists.txt | 26 ++++++++++--------- .../{citra-room.cpp => citra_room.cpp} | 0 .../{citra-room.rc => citra_room.rc} | 0 4 files changed, 15 insertions(+), 13 deletions(-) rename src/citra_room/{citra-room.cpp => citra_room.cpp} (100%) rename src/citra_room/{citra-room.rc => citra_room.rc} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea982584c..d30539967 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -452,7 +452,7 @@ if (NOT ANDROID AND NOT IOS) endif() if (ENABLE_DEDICATED_ROOM) - bundle_target(citra-room) + bundle_target(citra_room) endif() endif() diff --git a/src/citra_room/CMakeLists.txt b/src/citra_room/CMakeLists.txt index 8209f47eb..686de439e 100644 --- a/src/citra_room/CMakeLists.txt +++ b/src/citra_room/CMakeLists.txt @@ -1,34 +1,36 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) -add_executable(citra-room +add_executable(citra_room precompiled_headers.h - citra-room.cpp - citra-room.rc + citra_room.cpp + citra_room.rc ) -create_target_directory_groups(citra-room) +set_target_properties(citra_room PROPERTIES OUTPUT_NAME "citra-room") -target_link_libraries(citra-room PRIVATE citra_common network) +create_target_directory_groups(citra_room) + +target_link_libraries(citra_room PRIVATE citra_common network) if (ENABLE_WEB_SERVICE) - target_link_libraries(citra-room PRIVATE web_service) + target_link_libraries(citra_room PRIVATE web_service) endif() -target_link_libraries(citra-room PRIVATE cryptopp) +target_link_libraries(citra_room PRIVATE cryptopp) if (MSVC) - target_link_libraries(citra-room PRIVATE getopt) + target_link_libraries(citra_room PRIVATE getopt) endif() -target_link_libraries(citra-room PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) +target_link_libraries(citra_room PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) if(UNIX AND NOT APPLE) - install(TARGETS citra-room RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") + install(TARGETS citra_room RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") endif() if (CITRA_USE_PRECOMPILED_HEADERS) - target_precompile_headers(citra-room PRIVATE precompiled_headers.h) + target_precompile_headers(citra_room PRIVATE precompiled_headers.h) endif() # Bundle in-place on MSVC so dependencies can be resolved by builds. if (MSVC) include(BundleTarget) - bundle_target_in_place(citra-room) + bundle_target_in_place(citra_room) endif() diff --git a/src/citra_room/citra-room.cpp b/src/citra_room/citra_room.cpp similarity index 100% rename from src/citra_room/citra-room.cpp rename to src/citra_room/citra_room.cpp diff --git a/src/citra_room/citra-room.rc b/src/citra_room/citra_room.rc similarity index 100% rename from src/citra_room/citra-room.rc rename to src/citra_room/citra_room.rc