Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DescentDevelopers/Descent3
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8d1c271374e3c699f8bebcfd4311e543ccf71049
Choose a base ref
..
head repository: DescentDevelopers/Descent3
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b95d5b3c083727d98a3f998f0e375cfa96e0596e
Choose a head ref
Showing with 10 additions and 9 deletions.
  1. +10 −9 CMakeLists.txt
19 changes: 10 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
cmake_minimum_required(VERSION 3.20) # For using CMAKE_<LANG>_BYTE_ORDER

project(Descent3
LANGUAGES C CXX
VERSION 1.6.0
)

# set default cmake build type to Debug (None Debug Release RelWithDebInfo MinSizeRel)
if(NOT CMAKE_BUILD_TYPE AND NOT DEFINED ENV{CMAKE_BUILD_TYPE})
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "default build type")
@@ -29,10 +24,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
option(BUILD_EDITOR "Build internal editor" OFF)
endif()

if(SANITIZE_ADDRESS OR SANITIZE_MEMORY OR SANITIZE_THREAD OR SANITIZE_UNDEFINED)
set(SANITIZERS_ENABLED ON)
find_package(Sanitizers)
endif()
if(USE_VCPKG)
if(DEFINED ENV{VCPKG_ROOT})
if (CMAKE_TOOLCHAIN_FILE)
@@ -51,6 +42,11 @@ if(USE_VCPKG)
endif()
endif()

project(Descent3
LANGUAGES C CXX
VERSION 1.6.0
)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -118,6 +114,11 @@ if(BUILD_TESTING)
add_subdirectory(tests)
endif()

if(SANITIZE_ADDRESS OR SANITIZE_MEMORY OR SANITIZE_THREAD OR SANITIZE_UNDEFINED)
set(SANITIZERS_ENABLED ON)
find_package(Sanitizers)
endif()

# rebuild d3_version.h every time
add_custom_target(get_git_hash ALL)