sani7/remote-ui
1
0
Fork 0
mirror of https://github.com/Sani7/remote-ui.git synced 2026-10-27 06:01:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename executables

Browse Source
This commit is contained in:
sani7
2026-02-14 14:32:05 +01:00
parent d4e5b75f68
commit c6c765d528
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/CMakeLists.txt
+7 -7
View File
@@ -52,7 +52,7 @@ else()
endif() endif()
if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
qt_add_executable(Simulator-CVS_I10 qt_add_executable(unisim_client
MANUAL_FINALIZATION MANUAL_FINALIZATION
${PROJECT_SOURCES} ${PROJECT_SOURCES}
$<$<BOOL:${EMSCRIPTEN}>:${sims}> $<$<BOOL:${EMSCRIPTEN}>:${sims}>
@@ -63,20 +63,20 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
# For more information, see https: // doc.qt.io/qt-6/qt-add-executable.html#target-creation # For more information, see https: // doc.qt.io/qt-6/qt-add-executable.html#target-creation
else() else()
if(ANDROID) if(ANDROID)
add_library(Simulator-CVS_I10 SHARED add_library(unisim_client SHARED
${PROJECT_SOURCES} ${PROJECT_SOURCES}
) )
# Define properties for Android with Qt 5 after find_package() calls as: # Define properties for Android with Qt 5 after find_package() calls as:
# set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") # set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
else() else()
add_executable(Simulator-CVS_I10 add_executable(unisim_client
${PROJECT_SOURCES} ${PROJECT_SOURCES}
) )
endif() endif()
endif() endif()
set_target_properties( set_target_properties(
client unisim_client
PROPERTIES PROPERTIES
AUTOMOC ON AUTOMOC ON
AUTORCC ON AUTORCC ON
@@ -84,7 +84,7 @@ set_target_properties(
LINK_FLAGS "-Wl,--export-dynamic" LINK_FLAGS "-Wl,--export-dynamic"
) )
target_include_directories(client target_include_directories(unisim_client
PUBLIC PUBLIC
${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}
${CMAKE_CURRENT_LIST_DIR}/simulators ${CMAKE_CURRENT_LIST_DIR}/simulators
@@ -92,7 +92,7 @@ target_include_directories(client
${PROJECT_BINARY_DIR}/ ${PROJECT_BINARY_DIR}/
) )
target_link_libraries(client PRIVATE qwt spdlog Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::WebSockets magic_enum::magic_enum nlohmann_json::nlohmann_json git_tag) target_link_libraries(unisim_client PRIVATE qwt spdlog Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::WebSockets magic_enum::magic_enum nlohmann_json::nlohmann_json git_tag)
# Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1. # Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
# If you are developing for iOS or macOS you should consider setting an # If you are developing for iOS or macOS you should consider setting an
@@ -116,5 +116,5 @@ install(TARGETS Simulator-CVS_I10
) )
if(QT_VERSION_MAJOR EQUAL 6) if(QT_VERSION_MAJOR EQUAL 6)
qt_finalize_executable(Simulator-CVS_I10) qt_finalize_executable(unisim_client)
endif() endif()
server/CMakeLists.txt
+6 -6
View File
@@ -7,10 +7,10 @@ set(CMAKE_AUTOMOC ON)
find_package(Qt6 REQUIRED COMPONENTS Core WebSockets SerialBus Network) find_package(Qt6 REQUIRED COMPONENTS Core WebSockets SerialBus Network)
qt_standard_project_setup() qt_standard_project_setup()
qt_add_executable(server) qt_add_executable(unisim_server)
set_target_properties( set_target_properties(
server unisim_server
PROPERTIES PROPERTIES
LINK_FLAGS "-Wl,--export-dynamic" LINK_FLAGS "-Wl,--export-dynamic"
) )
@@ -19,7 +19,7 @@ file(GLOB_RECURSE CANSOURCES "CAN/*.[hc]pp")
file(GLOB_RECURSE VISASOURCES "VISA/*.[hc]pp") file(GLOB_RECURSE VISASOURCES "VISA/*.[hc]pp")
file(GLOB_RECURSE GPIOSOURCES "gpio/*.[hc]pp") file(GLOB_RECURSE GPIOSOURCES "gpio/*.[hc]pp")
target_sources(server PRIVATE target_sources(unisim_server PRIVATE
${CANSOURCES} ${CANSOURCES}
${VISASOURCES} ${VISASOURCES}
${GPIOSOURCES} ${GPIOSOURCES}
@@ -33,11 +33,11 @@ target_sources(server PRIVATE
websocket.hpp websocket.hpp
) )
target_compile_options(server PRIVATE $<$<CONFIG:Debug>: target_compile_options(unisim_server PRIVATE $<$<CONFIG:Debug>:
-Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion -Wall -Wextra -pedantic-errors -Wconversion -Wsign-conversion
>) >)
target_include_directories(server target_include_directories(unisim_server
PUBLIC PUBLIC
${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}
${CMAKE_CURRENT_LIST_DIR}/simulators ${CMAKE_CURRENT_LIST_DIR}/simulators
@@ -53,7 +53,7 @@ endif()
if (LINUX) if (LINUX)
set(GPIOD_LIB "gpiodcxx") set(GPIOD_LIB "gpiodcxx")
endif() endif()
target_link_libraries(server PRIVATE target_link_libraries(unisim_server PRIVATE
Qt::WebSockets Qt::WebSockets
Qt::SerialBus Qt::SerialBus
Qt::Network Qt::Network