From a577a86b5ca52c8587d24ad6641a41b2e6258399 Mon Sep 17 00:00:00 2001 From: Lectem Date: Sat, 13 Apr 2024 08:17:10 +0200 Subject: [PATCH 1/2] CMake: ASM should be listed last in project() so that it can use the C/C++ compiler executable as assembler From the project() CMake documentation: > If enabling ASM, list it last so that CMake can check whether compilers for other languages like C work for assembly too. --- capture/CMakeLists.txt | 2 +- csvexport/CMakeLists.txt | 2 +- import-chrome/CMakeLists.txt | 2 +- import-fuchsia/CMakeLists.txt | 2 +- profiler/CMakeLists.txt | 2 +- update/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/capture/CMakeLists.txt b/capture/CMakeLists.txt index 4970c38a..d7c4fba9 100644 --- a/capture/CMakeLists.txt +++ b/capture/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD 20) project( tracy-capture - LANGUAGES ASM C CXX + LANGUAGES C CXX ASM VERSION ${TRACY_VERSION_STRING} ) diff --git a/csvexport/CMakeLists.txt b/csvexport/CMakeLists.txt index 16e31014..a4f48aa6 100644 --- a/csvexport/CMakeLists.txt +++ b/csvexport/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD 20) project( tracy-csvexport - LANGUAGES ASM C CXX + LANGUAGES C CXX ASM VERSION ${TRACY_VERSION_STRING} ) diff --git a/import-chrome/CMakeLists.txt b/import-chrome/CMakeLists.txt index bff35802..6bfe6007 100644 --- a/import-chrome/CMakeLists.txt +++ b/import-chrome/CMakeLists.txt @@ -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} ) diff --git a/import-fuchsia/CMakeLists.txt b/import-fuchsia/CMakeLists.txt index 913f1a44..d2cc57af 100644 --- a/import-fuchsia/CMakeLists.txt +++ b/import-fuchsia/CMakeLists.txt @@ -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} ) diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index cddd61ef..78aec146 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -12,7 +12,7 @@ set(CMAKE_CXX_STANDARD 20) project( tracy-profiler - LANGUAGES ASM C CXX + LANGUAGES C CXX ASM VERSION ${TRACY_VERSION_STRING} ) diff --git a/update/CMakeLists.txt b/update/CMakeLists.txt index 679de976..7bd127fd 100644 --- a/update/CMakeLists.txt +++ b/update/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_CXX_STANDARD 20) project( tracy-update - LANGUAGES ASM C CXX + LANGUAGES C CXX ASM VERSION ${TRACY_VERSION_STRING} ) From 2530dceac474742d2802d728bc5dd884784c55de Mon Sep 17 00:00:00 2001 From: Lectem Date: Sun, 14 Apr 2024 18:13:51 +0200 Subject: [PATCH 2/2] CMake: Selecte executable project as startup project for VS --- capture/CMakeLists.txt | 1 + csvexport/CMakeLists.txt | 1 + import-chrome/CMakeLists.txt | 1 + import-fuchsia/CMakeLists.txt | 1 + profiler/CMakeLists.txt | 1 + update/CMakeLists.txt | 1 + 6 files changed, 6 insertions(+) diff --git a/capture/CMakeLists.txt b/capture/CMakeLists.txt index d7c4fba9..c9d3cc6f 100644 --- a/capture/CMakeLists.txt +++ b/capture/CMakeLists.txt @@ -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}) diff --git a/csvexport/CMakeLists.txt b/csvexport/CMakeLists.txt index a4f48aa6..fbccb69f 100644 --- a/csvexport/CMakeLists.txt +++ b/csvexport/CMakeLists.txt @@ -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}) diff --git a/import-chrome/CMakeLists.txt b/import-chrome/CMakeLists.txt index 6bfe6007..1fad807b 100644 --- a/import-chrome/CMakeLists.txt +++ b/import-chrome/CMakeLists.txt @@ -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}) diff --git a/import-fuchsia/CMakeLists.txt b/import-fuchsia/CMakeLists.txt index d2cc57af..84cdc1b0 100644 --- a/import-fuchsia/CMakeLists.txt +++ b/import-fuchsia/CMakeLists.txt @@ -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}) diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index 78aec146..1a8c9a62 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -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() diff --git a/update/CMakeLists.txt b/update/CMakeLists.txt index 7bd127fd..ba4028d9 100644 --- a/update/CMakeLists.txt +++ b/update/CMakeLists.txt @@ -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}) \ No newline at end of file