Merge pull request #772 from Lectem/server-cmake-fix

Server cmake fix : No need for ASM detection
This commit is contained in:
Bartosz Taudul 2024-04-14 22:00:03 +02:00 committed by GitHub
commit 411b218896
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 12 additions and 6 deletions

View File

@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD 20)
project(
tracy-capture
LANGUAGES ASM C CXX
LANGUAGES C CXX ASM
VERSION ${TRACY_VERSION_STRING}
)
@ -23,3 +23,4 @@ set(PROGRAM_FILES
add_executable(${PROJECT_NAME} ${PROGRAM_FILES} ${COMMON_FILES} ${SERVER_FILES})
target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer TracyGetOpt)
set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})

View File

@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD 20)
project(
tracy-csvexport
LANGUAGES ASM C CXX
LANGUAGES C CXX ASM
VERSION ${TRACY_VERSION_STRING}
)
@ -23,3 +23,4 @@ set(PROGRAM_FILES
add_executable(${PROJECT_NAME} ${PROGRAM_FILES} ${COMMON_FILES} ${SERVER_FILES})
target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer TracyGetOpt)
set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})

View File

@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD 20)
project(
tracy-import-chrome
LANGUAGES ASM C CXX
LANGUAGES C CXX ASM
VERSION ${TRACY_VERSION_STRING}
)
@ -23,3 +23,4 @@ set(PROGRAM_FILES
add_executable(${PROJECT_NAME} ${PROGRAM_FILES} ${COMMON_FILES} ${SERVER_FILES})
target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer)
set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})

View File

@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD 20)
project(
tracy-import-fuchsia
LANGUAGES ASM C CXX
LANGUAGES C CXX ASM
VERSION ${TRACY_VERSION_STRING}
)
@ -23,3 +23,4 @@ set(PROGRAM_FILES
add_executable(${PROJECT_NAME} ${PROGRAM_FILES} ${COMMON_FILES} ${SERVER_FILES})
target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer)
set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})

View File

@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD 20)
project(
tracy-profiler
LANGUAGES ASM C CXX
LANGUAGES C CXX ASM
VERSION ${TRACY_VERSION_STRING}
)
@ -153,6 +153,7 @@ if(WIN32)
win32/Tracy.rc
)
add_executable(${PROJECT_NAME} WIN32 ${PROFILER_FILES} ${COMMON_FILES} ${SERVER_FILES})
set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})
else()
add_executable(${PROJECT_NAME} ${PROFILER_FILES} ${COMMON_FILES} ${SERVER_FILES})
endif()

View File

@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD 20)
project(
tracy-update
LANGUAGES ASM C CXX
LANGUAGES C CXX ASM
VERSION ${TRACY_VERSION_STRING}
)
@ -26,3 +26,4 @@ set(PROGRAM_FILES
add_executable(${PROJECT_NAME} ${PROGRAM_FILES} ${COMMON_FILES} ${SERVER_FILES})
target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer TracyGetOpt)
set_property(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} PROPERTY VS_STARTUP_PROJECT ${PROJECT_NAME})