diff options
| author | Adam Bird <archez39@me.com> | 2024-02-28 23:49:06 -0500 |
|---|---|---|
| committer | Adam Bird <archez39@me.com> | 2024-02-28 23:49:06 -0500 |
| commit | 7bd2a7c3a6a57e3048584ee1678dd5d7702d3c80 (patch) | |
| tree | 18e3c811a7474a95f7e0b40d68c243eb9263e162 /CMakeLists.txt | |
| parent | 612da023f0f9da864c2830d2539e49b660ed2ff4 (diff) | |
| parent | bcbe4cb1c35798cc1017844fc453de8ab8bfc6f1 (diff) | |
Merge remote-tracking branch 'origin/develop' into merge-macready-805
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c8644af4..b5c06692b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,20 +13,18 @@ set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh) add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MP>) add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/utf-8>) -if (CMAKE_SYSTEM_NAME MATCHES "Windows|Linux") - if(NOT DEFINED BUILD_CROWD_CONTROL) - set(BUILD_CROWD_CONTROL ON) - endif() -endif() - if (CMAKE_SYSTEM_NAME STREQUAL "Windows") -include(CMake/automate-vcpkg.cmake) + include(CMake/automate-vcpkg.cmake) -set(VCPKG_TRIPLET x64-windows-static) -set(VCPKG_TARGET_TRIPLET x64-windows-static) + set(VCPKG_TRIPLET x64-windows-static) + set(VCPKG_TARGET_TRIPLET x64-windows-static) -vcpkg_bootstrap() -vcpkg_install_packages(zlib bzip2 libpng sdl2 sdl2-net glew glfw3) + vcpkg_bootstrap() + vcpkg_install_packages(zlib bzip2 libpng sdl2 sdl2-net glew glfw3) + + if (CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache|sccache") + set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT Embedded) + endif() endif() ################################################################################ |