Code

build(port): CMake improvements#3457

Code

Merged

scarf005 merged 188 commits intocataclysmbnteam:uploadcataclysmbnteam/Cataclysm-BN:uploadfrom olanti-p:cmake-stuffsolanti-p/Cataclysm-BN:cmake-stuffsCopy head branch name to clipboardNov 15, 2023

+1,800-1,598

Commits

Commits on Nov 13, 2023

• Add build options from Cataclysm-common.props

  

  alef

  authored and

  olanti-p

  committed
  01c9ee6

• Add more build options from msvc-full-features/

  

  alef

  authored and

  olanti-p

  committed
  2937a62

• Use main-pch instead of stdafx.h

  

  alef

  authored and

  olanti-p

  committed
  7c94484

• Copy msvc-full-features/vcpkg.json to source root

  

  alef

  authored and

  olanti-p

  committed
  3af7c54

• Add gettext and its tools as dependency

  

  alef

  authored and

  olanti-p

  committed
  0a59992

• Move MSVC options to own toolchain file

  

  alef

  authored and

  olanti-p

  committed
  e76b3b9

• Add a CMake presets file created by Visual Studio

  Show description for ed077c7
  

  alef

  authored and

  olanti-p

  committed
  ed077c7

• Fix not finding .lib files

  

  alef

  authored and

  olanti-p

  committed
  6d19600

• Do not autogenerate a manifest

  

  alef

  authored and

  olanti-p

  committed
  44e5e78

• Add gettext tools only duing Windows builds

  

  alef

  authored and

  olanti-p

  committed
  cfd4885

• Comment CL flags

  

  alef

  authored and

  olanti-p

  committed
  066296e

• Expose JPEG library from SDL

  

  alef

  authored and

  olanti-p

  committed
  231707c

• Switch back to Ninja, no build performance gains wtih MSBuild

  

  alef

  authored and

  olanti-p

  committed
  f81281e

• Tell VCPKG to use static linking

  

  alef

  authored and

  olanti-p

  committed
  808b030

• Revert "build(cmake): deduplicate library setup (cataclysmbnteam#3248)"

  Show description for 202b679
  olanti-p

  committed
  202b679

• Fix missing symbols required by SDL

  

  alef

  authored and

  olanti-p

  committed
  b9b2979

• Fix validate_json.py test by removing UTF-8 BOM from presets file

  

  alef

  authored and

  olanti-p

  committed
  8467af9

• Include vcpkg.cmake instead of using as toolchain file

  

  alef

  authored and

  olanti-p

  committed
  33d592b

• Rewrite presets from scratch

  

  alef

  authored and

  olanti-p

  committed
  9128d7f

• Find VCPK installation through env

  

  alef

  authored and

  olanti-p

  committed
  46fb1e1

• Move Ninja to MSVC preset

  

  alef

  authored and

  olanti-p

  committed
  5d9e053

• Upgrade to CMake 3.20 to allow new policies

  

  alef

  authored and

  olanti-p

  committed
  a1e326e

• Use CMAKE_CXX_FLAGS_INIT instead of add_compile_options()

  

  alef

  authored and

  olanti-p

  committed
  d452725

• Typo

  

  alef

  authored and

  olanti-p

  committed
  581f080

• Specific flag for RelWithDebInfo

  

  alef

  authored and

  olanti-p

  committed
  d73fe73

• Set new policies to remove other flags

  

  alef

  authored and

  olanti-p

  committed
  d9669df

• Allow using /MT

  

  alef

  authored and

  olanti-p

  committed
  52addbe

• Add a CMake build preset

  

  alef

  authored and

  olanti-p

  committed
  233205e

• Add x64-debug for MSVC

  

  alef

  authored and

  olanti-p

  committed
  a055ddb

• Add /GF as suggested

  

  alef

  authored and

  olanti-p

  committed
  c3a7836

• Removed as requested. CMake version refers

  

  alef

  authored and

  olanti-p

  committed
  76359cf

• Add /OPT as requested

  

  alef

  authored and

  olanti-p

  committed
  09a1387

• Skip PCH when generating compile_commands.json

  

  alef

  authored and

  olanti-p

  committed
  b6e64ad

• tab vs. spaces

  

  alef

  authored and

  olanti-p

  committed
  95ed3a5

• Update CMakeLists.txt

  Show description for dab44d8
  

  alef

  authored and

  olanti-p

  committed
  dab44d8

• Move vcpkg.json into msvc directory

  

  alef

  authored and

  olanti-p

  committed
  5305191

• Using project's VCPKG Triplets

  

  alef

  authored and

  olanti-p

  committed
  2a2839c

• Forgot ENV{} is special in if()

  

  alef

  authored and

  olanti-p

  committed
  7569b52

• Edit comments

  

  alef

  authored and

  olanti-p

  committed
  853d419

• Use Windows path separator

  

  alef

  authored and

  olanti-p

  committed
  c5c221f

• Retrieve VS environment variables from VsDevCmd

  

  alef

  authored and

  olanti-p

  committed
  836f4a9

• Rewrite the list of envs to be a CMake list

  

  alef

  authored and

  olanti-p

  committed
  f19462e

• Loop over envs modified by VsDevCmd

  

  alef

  authored and

  olanti-p

  committed
  58f7a13

• Split environment variable in key/value and trim value

  

  alef

  authored and

  olanti-p

  committed
  0aa2407

• Set CMake environment with VsDevCmd set values

  

  alef

  authored and

  olanti-p

  committed
  f88b80c

• Write a JSON string for CMakeUserPresets build environment

  

  alef

  authored and

  olanti-p

  committed
  39df738

• Write CMakeUserPresets.json based on VsDevCmd envs

  

  alef

  authored and

  olanti-p

  committed
  1212b50

• Set the C and C++ compilers to VS

  

  alef

  authored and

  olanti-p

  committed
  2721e18

• Remove the CMake build presets now in CMakeUserPreset.json

  

  alef

  authored and

  olanti-p

  committed
  224b16e

• Moving user presets hack into the include_before script

  Show description for 9a8edf2
  

  alef

  authored and

  olanti-p

  committed
  9a8edf2

• More MS linker flags from linking stage in .vcxproj

  

  alef

  authored and

  olanti-p

  committed
  7bcf44f

• Use MinGW's msgfmt.exe from Git for Windows

  

  alef

  authored and

  olanti-p

  committed
  10ef97f

• Removing vcpkg triplets for gha as requested

  

  alef

  authored and

  olanti-p

  committed
  ef03937

• Set default msgfmt

  

  alef

  authored and

  olanti-p

  committed
  2beee5c

• Search ninja.exe only when generator is Ninja*

  

  alef

  authored and

  olanti-p

  committed
  bb8336f

• Add MSYS to find_program msgfmt.exe

  

  alef

  authored and

  olanti-p

  committed
  e066ff8

• Removing gettext/msgfmt whole build, as requested

  

  alef

  authored and

  olanti-p

  committed
  699450b

• Fix sourcing VsDevCmd.bat twice

  

  alef

  authored and

  olanti-p

  committed
  9e5a73b

• Enable LOCALIZE in Release

  

  alef

  authored and

  olanti-p

  committed
  3ede77f

• PREFIX doesn't go through C preprocessor stringification

  Show description for c658179
  

  alef

  authored and

  olanti-p

  committed
  c658179

• Correct logic for -Wno-unknown-warning-option

  Show description for 33fc433
  

  2 peopleauthored and

  olanti-p

  committed
  33fc433

• Use correct cmake variable for prefix.h.in

  

  perryprog

  authored and

  olanti-p

  committed
  1826515

• Use CMake 3.21 or later

  

  alef

  authored and

  olanti-p

  committed
  366f466

• Change all target_link_libraries to interface form

  

  alef

  authored and

  olanti-p

  committed
  436c3b2

• Change find_package if using VCPKG manitest

  Show description for 5fe91dc
  

  alef

  authored and

  olanti-p

  committed
  5fe91dc

• Set the correct property for using ccache

  

  alef

  authored and

  olanti-p

  committed
  14e4db2

• Set compiler launchers before adding subdirectories

  

  alef

  authored and

  olanti-p

  committed
  141ccee

• Fix release installation paths

  

  alef

  authored and

  olanti-p

  committed
  f7fd170

• Align CMake release install

  

  alef

  authored and

  olanti-p

  committed
  c0abe81

• Do not use our Find* modules under VCPKG

  

  alef

  authored and

  olanti-p

  committed
  157871a

• Remove redundant modules from CMakeModules

  Show description for db6584d
  

  alef

  authored and

  olanti-p

  committed
  db6584d

• Add documentation for CMake+VCPKG build

  Show description for df9a436
  

  2 peopleauthored and

  olanti-p

  committed
  df9a436

• Use VCPKG triplets from build-scripts/

  Show description for 797ea3c
  

  alef

  authored and

  olanti-p

  committed
  797ea3c

• Optmize replacing ENV vars loop with find()

  

  alef

  authored and

  olanti-p

  committed
  39d25f9

• Force ninja.exe path in the INCLUDE_BEFORE file

  

  alef

  authored and

  olanti-p

  committed
  3f97adf

• Add varialbes to "name" and "configurePreset"

  Show description for af1fb41
  

  alef

  authored and

  olanti-p

  committed
  af1fb41

• Rename presets to match release.yml names

  Show description for 23a20c4
  

  alef

  authored and

  olanti-p

  committed
  23a20c4

• Move VsDevCmd environment parsing to its dedicated script

  

  alef

  authored and

  olanti-p

  committed
  1f7def7

• Fix checking for DevEnvDir

  

  alef

  authored and

  olanti-p

  committed
  83de2ef

• Fix parsing non variables output

  

  alef

  authored and

  olanti-p

  committed
  08a2063

• Document and improve VsDevCmd.cmake

  Show description for ca5e1d4
  

  alef

  authored and

  olanti-p

  committed
  ca5e1d4

• Use vswhere.exe as suggested by akrieger

  Show description for 2ae73c2
  

  alef

  authored and

  olanti-p

  committed
  2ae73c2

• Makes Ninja generators on Windows optional

  

  alef

  authored and

  olanti-p

  committed
  d2662fa

• Move hardcoded path into preset

  

  alef

  authored and

  olanti-p

  committed
  c3a0994

• Build a release

  

  alef

  authored and

  olanti-p

  committed
  88810ea

• Rewrite instructions addin VS procedure. Change displayed name

  

  alef

  authored and

  olanti-p

  committed
  dd82e65

• Add a missing target public interface

  

  alef

  authored and

  olanti-p

  committed
  947b868

• Update doc/COMPILING/COMPILING-CMAKE-VCPKG.md

  Show description for e9db703
  

  2 peopleauthored and

  olanti-p

  committed
  e9db703

• Reverting SDL2 TTF library name resolution in VCPKG

  Show description for d2868a4
  

  alef

  authored and

  olanti-p

  committed
  d2868a4

• Move VCPKG to Windows only builds

  

  alef

  authored and

  olanti-p

  committed
  d0d0d34

• Use SDL2_ttf when not using VCPKG

  

  alef

  authored and

  olanti-p

  committed
  4f0a8cc

• Disable the MSYS build preset

  

  alef

  authored and

  olanti-p

  committed
  a03a1c7

• Search for gettext in one place

  

  alef

  authored and

  olanti-p

  committed
  2838315

• Make VCPKG_ROOT optional in MSVC too

  Show description for d092896
  

  alef

  authored and

  olanti-p

  committed
  d092896

• Allow to configure msgfmt and VCPKG paths

  

  alef

  authored and

  olanti-p

  committed
  537161f

• Fix using cache var in find_program(). Remove extra find_package

  

  alef

  authored and

  olanti-p

  committed
  5938740

• Use correct Git for Windows directory

  Show description for e526411
  

  2 peopleauthored and

  olanti-p

  committed
  e526411

• Make building tests optional. Use "TESTS" cache var

  

  alef

  authored and

  olanti-p

  committed
  c750cd1

• Install more directories

  

  alef

  authored and

  olanti-p

  committed
  0eb91e2

• Update doc/COMPILING/COMPILING-CMAKE-VCPKG.md

  Show description for 4982274
  

  2 peopleauthored and

  olanti-p

  committed
  4982274

• Satisfy cmake-lint

  

  alef

  authored and

  olanti-p

  committed
  0aeacf7

• Move logic non belonging to data/ up

  

  alef

  authored and

  olanti-p

  committed
  69c968d

• Install VERSION.txt

  

  alef

  authored and

  olanti-p

  committed
  7be796b

• Switch building tests from CMake to presets

  

  alef

  authored and

  olanti-p

  committed
  d84084c

• Add shlwapi required by mpg123

  

  alef

  authored and

  olanti-p

  committed
  dde9e43

• Split SDL2 mixer package names

  

  alef

  authored and

  olanti-p

  committed
  ee99744

• Enable sound

  

  alef

  authored and

  olanti-p

  committed
  e843301

• Correct CMake install locations on *nix

  

  perryprog

  authored and

  olanti-p

  committed
  0825fee

• Remove x86 specific macro definitions in MSVC build in CMake (#62602)

  

  BrettDong

  authored and

  olanti-p

  committed
  b807630

• Fix CMake compilation and localization

  Show description for c8b91f9
  

  Qrox

  authored and

  olanti-p

  committed
  c8b91f9

• Enable -g1 in CMake release build to produce source and line number in stack trace (#64705)

  

  Qrox

  authored and

  olanti-p

  committed
  e590c7e

• Add CMake option for XDG directories

  

  sparr

  authored and

  olanti-p

  committed
  e2696e8

• Update vcpkg configuration, again

  

  akrieger

  authored and

  olanti-p

  committed
  c8f30e5

• Downgrade cmake files to v3.20

  Show description for f3068fe
  

  alef

  authored and

  olanti-p

  committed
  f3068fe

• Add VERSION.txt to .gitignore

  

  BrettDong

  authored and

  olanti-p

  committed
  24fcf29

• Add 'out/' to .gitignore

  olanti-p

  committed
  0b593fc

• Fix merge conflict related to PCH, always use PCH

  olanti-p

  committed
  d74bcf5

• BNify link in VERSION.txt

  olanti-p

  committed
  7e79c00

• BNify comment

  olanti-p

  committed
  a9390c0

• Fix Lua build

  olanti-p

  committed
  be268e7

• Makefile fix

  olanti-p

  committed
  8413515

• Restore builtin-baseline in manifest

  olanti-p

  committed
  3afd203

• Make USE_PREFIX_DATA_DIR option available to Unix only

  

  alef

  authored and

  olanti-p

  committed
  00391f4

• Replace all system specific *_DIR with CMAKE_INSTALL_*

  

  alef

  authored and

  olanti-p

  committed
  fb672bb

• Use relative paths, use list append command

  

  alef

  authored and

  olanti-p

  committed
  40ab8f2

• Configure prefix.h.in earlier

  

  alef

  authored and

  olanti-p

  committed
  1d0318b

• Compact presets. VCPKG_ROOT now an env variable

  

  alef

  authored and

  olanti-p

  committed
  49a470a

• Remove cmake_minimum_required from subdirectories

  

  alef

  authored and

  olanti-p

  committed
  a881c12

• Reduce CMake configuration output for releases

  

  alef

  authored and

  olanti-p

  committed
  e7b1485

• Use pkg-config to help finding mostly static libraries

  Show description for 5f5b577
  

  alef

  authored and

  olanti-p

  committed
  5f5b577

• Prefer MSBuild on Windows

  

  alef

  authored and

  olanti-p

  committed
  74ff612

• Make Linux preset name refer to VCPKG

  Show description for 9aa47d3
  

  alef

  authored and

  olanti-p

  committed
  9aa47d3

• Dynamically link SDL2_mixer

  

  alef

  authored and

  olanti-p

  committed
  30ca871

• Add a function to force an fs::path to a dir

  

  alef

  authored and

  olanti-p

  committed
  3a70a4a

• Use the normalized directory path

  

  alef

  authored and

  olanti-p

  committed
  3e4210f

• Add SDL2 targets for dynamic linking

  

  alef

  authored and

  olanti-p

  committed
  3c6ea93

• Add more required libs to SDL2_image imported target

  

  alef

  authored and

  olanti-p

  committed
  03b27e4

• Removing libzip not required for dynamic linking

  

  alef

  authored and

  olanti-p

  committed
  75b7551

• Hotfix: Append a path delimiter for the 'dot' directory.

  

  alef

  authored and

  olanti-p

  committed
  7c2430a

• Improve CMake behavior on Unix and macOS

  Show description for 5a4ef86
  

  perryprog

  authored and

  olanti-p

  committed
  5a4ef86

• Disable lang install

  olanti-p

  committed
  1f2ee34

Commits on Nov 14, 2023

• style(autofix.ci): automated formatting

  

  autofix-ci[bot]

  authored and

  olanti-p

  committed
  a8e6c8b

• Enable Lua in presets

  olanti-p

  committed
  6b04e96

• Add CMake+MSVC build to CI

  olanti-p

  committed
  c060726

• Remove VCPKG_ROOT override

  olanti-p

  committed
  2a03630

• Remove Strawberry Pearl from PATH

  olanti-p

  committed
  a16d258

• Add freetype overlay port

  olanti-p

  committed
  1aafdda

• Remove brotli feature from freetype

  olanti-p

  committed
  850a411

• Small fixes in CMake build in Linux

  Show description for 82eaf9d
  

  alef

  authored and

  olanti-p

  committed
  82eaf9d

• Add INTERFACE_INCLUDE_DIRECTORIES to SDL2 targets

  

  alef

  authored and

  olanti-p

  committed
  f6027de

• Move pkg-config required FLAC dependency inside conditions

  

  alef

  authored and

  olanti-p

  committed
  c7bc481

• Fix clang-tidy workflow by installing 'required' libflac-dev

  

  akrieger

  authored and

  olanti-p

  committed
  4f9fea5

• Add libflac to matrix

  olanti-p

  committed
  47902ee

• Fix merge mistakes and style differences

  olanti-p

  committed
  831b371

• Don't re-define LUA

  olanti-p

  committed
  5d5ecfe

• Style fixes

  olanti-p

  committed
  69d184c

• Fix wrong merge

  olanti-p

  committed
  4fad25b

• Add CMake + MSYS2 build to matrix

  olanti-p

  committed
  b0762c8

• Update vcpkg

  olanti-p

  committed
  2e079bf

• BNify install dir

  olanti-p

  committed
  e303885

• Use CMake to build translations in CI

  olanti-p

  committed
  abd783e

• Update documentation

  olanti-p

  committed
  4063a84

• Add separate preset for VS 2022

  olanti-p

  committed
  e921836

• Implement missing members of vpart iterators

  olanti-p

  committed
  fb115a5

• Remove deprecated headers from stdafx.h

  olanti-p

  committed
  b1d1053

• Fix float conversion warnings C4244

  olanti-p

  committed
  2159cbb

• Show current path if failed to find data dir

  olanti-p

  committed
  24766ed

• Force translation tests to end up on english

  olanti-p

  committed
  d23d01d

• Fix build config setup in msvc Cmake preset

  olanti-p

  committed
  9295642

• Fix path to tests

  olanti-p

  committed
  8cd0326

• Add RelWithDebInfo to gitignore

  olanti-p

  committed
  af73a1a

• Set cwd for debugging in VS

  olanti-p

  committed
  d5c13ac

• Add Debug configuration, enable tests

  olanti-p

  committed
  7b56192

• Add docs on running from VS

  olanti-p

  committed
  1771174

• style(autofix.ci): automated formatting

  

  autofix-ci[bot]

  authored and

  olanti-p

  committed
  e419d52

• Add Release configuration

  Show description for 2f8c909
  olanti-p

  committed
  2f8c909

• ci: run MSYS on upload only

  olanti-p

  committed
  ab845e4

• Unify CMake and Makefile warnings

  olanti-p

  committed
  dcc986f

• ci: tweak msys cmake build

  olanti-p

  committed
  3b741b8

• Remove /permissive-

  olanti-p

  committed
  4639045

• Alt fix for compiling Lua with CXX compiler

  olanti-p

  committed
  546c1af

• Add PCH to tests

  olanti-p

  committed
  e6ec2fd

• Fix more UB on global statics cleanup

  olanti-p

  committed
  439334d

• Tweaks to VS CMake guide

  olanti-p

  committed
  620824c

• Add new options to CMake guide

  olanti-p

  committed
  00fed13

• Fix port mistake

  olanti-p

  committed
  c691c40

• Remove automatic CMake formatter

  olanti-p

  committed
  edd04f0

• Only run CMake+MSVC on upload

  olanti-p

  committed
  858bbe3