From 46718851da3dfcc439eba7e77fd388461a2422db Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 17 Mar 2024 13:25:29 +0100 Subject: [PATCH] Extract some common definitions. --- cmake/config.cmake | 26 ++++++++++++++++++++++++++ cmake/server.cmake | 8 ++++++++ cmake/vendor.cmake | 4 ---- profiler/CMakeLists.txt | 32 +------------------------------- 4 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 cmake/config.cmake diff --git a/cmake/config.cmake b/cmake/config.cmake new file mode 100644 index 00000000..3b565108 --- /dev/null +++ b/cmake/config.cmake @@ -0,0 +1,26 @@ +if (NOT NO_ISA_EXTENSIONS) + include(CheckCXXCompilerFlag) + if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") + CHECK_CXX_COMPILER_FLAG("-mcpu=native" COMPILER_SUPPORTS_MCPU_NATIVE) + if(COMPILER_SUPPORTS_MARCH_NATIVE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=native") + endif() + else() + CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE) + if(COMPILER_SUPPORTS_MARCH_NATIVE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native") + endif() + endif() +endif() + +if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT LEGACY) + set(USE_WAYLAND ON) +else() + set(USE_WAYLAND OFF) +endif() + +if(WIN32) + add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN) +endif() diff --git a/cmake/server.cmake b/cmake/server.cmake index e6211c57..a1d1e5d0 100644 --- a/cmake/server.cmake +++ b/cmake/server.cmake @@ -32,3 +32,11 @@ target_link_libraries(TracyServer PUBLIC TracyCapstone TracyZstd) if(NO_STATISTICS) target_compile_definitions(TracyServer PUBLIC TRACY_NO_STATISTICS) endif() + +if(UNIX) + target_link_libraries(TracyServer PRIVATE TracyTbb) +endif() + +if(WIN32) + target_link_libraries(${PROJECT_NAME} PRIVATE ws2_32) +endif() diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 9442b7b1..86e4be08 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -3,10 +3,6 @@ set (ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../") -if(WIN32) - add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN) -endif() - # Dependencies are taken from the system first and if not found, they are pulled with CPM and built from source include(FindPkgConfig) diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index 6ab17c65..83df9382 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -16,29 +16,7 @@ project( VERSION ${TRACY_VERSION_STRING} ) -if (NOT NO_ISA_EXTENSIONS) - include(CheckCXXCompilerFlag) - if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") - CHECK_CXX_COMPILER_FLAG("-mcpu=native" COMPILER_SUPPORTS_MCPU_NATIVE) - if(COMPILER_SUPPORTS_MARCH_NATIVE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mcpu=native") - endif() - else() - CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE) - if(COMPILER_SUPPORTS_MARCH_NATIVE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native") - endif() - endif() -endif() - -if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT LEGACY) - set(USE_WAYLAND ON) -else() - set(USE_WAYLAND OFF) -endif() - +include(${CMAKE_CURRENT_LIST_DIR}/../cmake/config.cmake) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/vendor.cmake) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/server.cmake) @@ -149,11 +127,3 @@ else() endif() target_link_libraries(${PROJECT_NAME} PRIVATE TracyServer TracyImGui TracyNfd) - -if(UNIX) - target_link_libraries(${PROJECT_NAME} PRIVATE TracyTbb) -endif() - -if(WIN32) - target_link_libraries(${PROJECT_NAME} PRIVATE ws2_32) -endif() \ No newline at end of file