2ef36b9ccc
clarify logic for selecting 32 vs 64 bit
2022-12-10 18:13:19 -08:00
e5f0668afd
fix error message for VS version requirement
2022-12-10 18:11:32 -08:00
96e56c3676
make tree minimally compatible with VS2022
2022-12-10 07:09:48 +00:00
fed9f763c9
update version string in CMake and changelog
2022-12-02 10:18:26 -08:00
cf24fc7829
ugh unit tests don't work on our OSX build either
2022-11-30 06:57:11 -08:00
5d08a0f765
skip unit tests on windows until build env updated
...
otherwise we get fatal error C1902: Program database manager mismatch; please check your installation
revert this commit once windows is updated
2022-11-30 05:34:39 -08:00
cf8bcbd424
remove unnecessary warning message
2022-11-30 05:08:53 -08:00
d0a6a3e930
remove unnecessary target modifications
2022-11-28 17:43:55 -08:00
ae035d5836
simplify unit testing setup
2022-11-28 17:16:48 -08:00
72ad7a1b01
Adds googletest/include for test targets only
2022-11-25 09:43:04 -08:00
b11b1c3d5f
Updates build.yml & moves TEST variable setup
2022-11-25 09:43:04 -08:00
25f87306b4
Removes separated unit test executables
2022-11-25 09:43:04 -08:00
79551f7ef0
Updates CMake TESTING vars
2022-11-25 09:43:04 -08:00
268719ed1f
Integrates googletest
2022-11-25 09:43:04 -08:00
8e18d610f5
cmake: Add SDL dep for Linux dfhack; deprecate BUILD_TESTS
...
On Linux, libdfhack.so depends on libSDL.so, but that was not marked
inside CMake. As it's only used via LD_PRELOAD, there was no problem.
But when linking unit tests against it, this becomes necessary. It may
be wise to add a find_package(SDL) to provide the user with more
control, but just a hard-coded "SDL" should work for most installs.
The CTest module creates a BUILD_TESTING option, which clashes
(thematically, not in code) with the existing BUILD_TESTS option.
Resolve it thus:
- Deprecate BUILD_TESTS; it still works, but is marked as an advanced
option so it doesn't show in the CMake UI by default.
- Add a new BUILD_TEST_SCRIPTS that does what BUILD_TESTS used to do,
but is a "dependent" option so it goes away if BUILD_TESTING=OFF.
The up-shot is that, by default, the C++ unit tests will be built
(BUILD_TESTING=ON) and the Lua integration tests are not installed
(BUILD_TEST_SCRIPTS=OFF).
2022-11-25 09:43:04 -08:00
c5be87e381
unit tests: Add CTest support, and a trivial first unit test
...
If BUILD_TESTS=ON:
- Adds a 'test' target for ninja
- Adds a library/MiscUtils.test unit test executable
2022-11-25 09:43:04 -08:00
b6ffaebeda
refine comments
2022-11-18 15:29:02 -06:00
a16aca0f03
up MSVC warning level to /W3 /WX
...
This makes MSVC warn at a level comparable to what we use on gcc for Linux builds
2022-11-18 15:09:50 -06:00
3f6e92eda4
finalize 0.47.05-r7 release
2022-09-30 11:58:22 -07:00
a080872a0a
include other doc build types in ninja clean
2022-08-26 13:37:58 -07:00
340b524348
Invoke build.py with cmake-found python
...
In the Buildmaster GCC 4.8 image, `/usr/bin/env python3` appears to find the
system Python (3.4) as opposed to the newer Python (3.6) we install separately.
2022-08-15 17:49:44 -04:00
488fd67742
output version of found sphinx and python
2022-08-14 23:01:20 -07:00
f1f207b45b
don't include rst sources in html output
2022-08-13 21:51:36 -07:00
8f332c5925
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2022-08-08 06:39:12 +00:00
7274a8cd2a
use docs/build.py to do the docs build
...
and add sphinx extension python files to the build deps
2022-08-07 23:35:00 -07:00
02a8f63ffc
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2022-08-06 05:38:20 +00:00
d04beb0e4a
remove -E for sphinx-build. ninja clean can do it.
2022-08-05 22:21:14 -07:00
3e30b435fd
clean up docs build deps
2022-08-05 22:20:58 -07:00
b3a2a10caa
clean up generate doc dirs with ninja clean
2022-08-05 22:05:52 -07:00
8173f6dd02
Merge remote-tracking branch 'upstream/develop' into docs
2022-07-18 10:59:00 -07:00
fdd406b722
ensure all files are reread on every docs build
...
this fixes the issue where the Stonesense docs were getting ignored
2022-07-10 20:19:12 -07:00
8d99b7e6e1
prepare for plugin doc split
2022-07-10 20:19:09 -07:00
f1cb9b9a83
Build and install text help alongside html ( #2236 )
...
* build text docs alongside html
also:
- capture more doc dependencies that should cause rebuilds
- move intermediate build output (doctree data) into build dir
- allow sphinx build to multitask more for faster completion times
* install text help alongside html help
* update settings in docs build action
2022-07-10 20:14:20 -07:00
739871bc0f
Remove Hooks-egg.cpp and related code and configuration options
2022-06-29 23:35:14 -04:00
88ae50b9ae
update version and changelog to 0.47.05-r6
2022-06-17 15:42:23 -07:00
585888c2d3
update version, changelog, modules for 0.47.05-r5
2022-05-04 17:21:31 -07:00
69ca0d8a28
Improves support for dfhack as a sub-project ( #2058 )
...
Replaces CMAKE_SOURCE_DIR with dfhack_SOURCE_DIR so it can be included in other cmake projects that have a different top-level CMAKE_SOURCE_DIR
2022-03-29 10:28:52 -07:00
cf54b84fd6
Bump to 0.47.05-r4
2022-03-09 14:27:20 -08:00
e7754ea890
Enable -Wunused-variable and fix most errors
2021-09-07 01:16:21 -04:00
8d551c7a7c
GCC: enable -Wall and -Werror for all build types
...
Also make protobuf flags consistent across build types so that release builds
pass
2021-09-06 22:56:55 -04:00
1295633722
Bump to 0.47.05-r3
2021-09-04 14:00:31 -04:00
dde589967a
Bump to 0.47.05-r2, update changelog
2021-07-09 21:21:36 -04:00
5f00183177
move test harness out of test dir
...
and install to test.lua in top-level scripts directory instead of test/main.lua
2021-03-22 10:15:32 -07:00
89e11b56f2
Merge remote-tracking branch 'myk002/myk_no_test_scripts' into develop
2021-03-14 14:42:51 -04:00
795bd27d92
Add checks for scripts and luacov submodules
2021-03-10 00:21:46 -05:00
f7ce441a3f
ensure test/scripts does not exist in dfhack repo
2021-03-07 08:21:14 -08:00
032cd64c10
Bump to r1, update submodules and changelog
2021-03-06 13:30:16 -05:00
2bb4dbccc6
Replace installed hack/changelog.txt with stub
...
This was incomplete, but people were still referencing it.
Closes #1775
2021-03-06 12:43:31 -05:00
95e2582219
add include directory for lodepng
2021-02-24 18:23:15 -06:00
49b6e814db
Bump to beta1, update submodules
2021-02-10 21:08:45 -05:00
233925ec75
Bump to 0.47.05-alpha0, update xml
2021-01-31 12:10:00 -05:00
d2f3ec6076
Bump to 0.47.04-r5, adjust changelog
2021-01-30 21:23:44 -05:00
eb6957a167
Bump to 0.47.04-r4 and update submodules
2020-12-24 13:32:44 -05:00
b343d00800
Update to 0.47.04-r3 (authors, changelog, and submodules)
2020-10-10 17:31:30 -04:00
3e2dd2a396
quickfort docs: dreamfort case study
2020-10-07 14:01:22 -07:00
64b1202119
Fix some CMake warnings and extraneous output
2020-09-19 01:17:25 -04:00
b85759620f
Switch libzip and xlsxio to be included with add_subdirectory(), disable xlsxio installation
2020-09-18 00:33:41 -04:00
1e068ef247
output useful error if new deps are not found
2020-08-15 22:34:43 -07:00
a41f7c0998
convert XlsxReader module to xlsxreader plugin
2020-08-09 08:54:42 -07:00
8913d43d6f
ensure xlsxio_project gets built before dfhack
2020-08-09 02:59:22 -07:00
79415cf097
clean up dep lib vars
2020-08-09 02:24:05 -07:00
8753f9feaf
use correct lib dir on 32-bit
2020-08-08 20:42:03 -07:00
8a05f09cd6
add libexpat to the build
2020-08-08 20:18:43 -07:00
28eaf0ae8b
add libzip to the build
2020-08-08 20:04:46 -07:00
18f4786458
Merge remote-tracking branch 'upstream/develop' into quickfort_xlsxio
2020-08-08 17:17:45 -07:00
89a6309788
build xlsxio and link it into dfhack, add lua api
2020-08-08 15:24:12 -07:00
f2b0f012c9
Bump to 0.47.04-r2
2020-08-08 14:53:24 -04:00
88dffd6474
quickfort files and docs
2020-07-18 08:54:24 -07:00
1058e40cb0
Enable /bigobj globally on MSVC.
...
This changes the intermediate format used for compiled files from one
that can hold up to 65279 (slightly less than 2^16) addressable sections
to one that can hold 4294967296 (2^32).
Code that uses templates, such as... C++ code... can easily run up
against the smaller limit. This does not affect the finished executable,
only the intermediate object files.
2020-05-09 18:23:18 -05:00
6bdbf5b0dd
Update to 0.47.04-r1, update xml, scripts, changelog version
2020-04-25 21:33:02 -04:00
d3a007489c
Fix ZLIB_ROOT in newer CMake versions
2020-04-19 12:16:48 -04:00
c8a0ac146c
Update submodules, changelog, CMakeLists, Authors
2020-04-04 01:36:52 -04:00
91fad90167
Make test base folder customizable, clean up, stop always installing test folder
2020-04-01 00:26:51 -04:00
666b35f1f6
Add "bit" suffix to package architecture (hopefully reduces confusion)
2020-03-21 02:42:12 -04:00
7d6594bfe8
Add BUILD_TESTS CMake option
2020-03-21 02:39:00 -04:00
fe2ea17880
change DF version
...
add -maxerrors and -failfast to check-structures-sanity
2020-03-01 12:15:26 -06:00
fb6dd691d7
Update changelog + CMakeLists for 0.47.03-beta1
2020-02-27 19:56:37 -05:00
b033a215bd
update for Dwarf Fortress 0.47.03
2020-02-16 18:48:27 -06:00
f54c361718
Add an implementation of mifki's sizecheck library (tested on Linux)
2020-02-08 21:18:29 -05:00
b375586b67
Update to DF 0.47.02
2020-02-07 16:00:53 -06:00
62e3802d26
Update to DF 0.47.01
2020-01-29 14:51:48 -06:00
163971ec56
Bump version to 0.44.12-r3
2020-01-19 00:05:43 -05:00
8a07426643
Merge branch 'develop' into cmake-cleanup
2019-07-20 15:15:39 -04:00
ea0105fa66
Add CMake option to provide custom libstdc++ on macOS ( #1344 )
2019-07-20 11:21:44 -04:00
76da2c2aaf
Clean up CMakeLists.txt style
2019-07-16 22:19:11 -04:00
ea37eecfb1
Document and warn about old CMake versions with Ninja
...
Resolves #1369
2019-07-16 19:33:33 -04:00
9fe24e1b3f
Update changelog and bump version to r2
2018-12-27 19:39:43 -05:00
40669d7a63
Change CMakeSettings.json to use Ninja.
...
Add DFHACK_INCLUDE_CORE option for easier development.
2018-07-20 13:29:18 -05:00
063602349c
Add a basic test library and a couple GUI module tests (squashed)
...
Also modified Core/Console a bit to get this to actually produce output on
Travis (DFHACK_DISABLE_CONSOLE now allows console output, just not input)
Squashed merge from lethosor/tests
2018-07-18 14:29:13 -04:00
1d6c3dc871
Merge remote-tracking branch 'suokko/fix_cmake_dependencies_to_generated_headers' into develop
2018-07-17 00:24:18 -04:00
c2a64b3573
Update changelog, xml, bump to r1
2018-07-13 21:16:35 -04:00
14725bce59
Make DFHACK_BUILD_ARCH default to 64
2018-07-13 11:04:33 -04:00
1226919b16
Fix the CMAKE_BUILD_TYPE help string and make it list of strings in gui
...
While testing the build dependency issues I noticed that cmake C module
overwrites our CMAKE_BUILD_TYPE help. I decided to fix the help and make
the build type a gui string which makes it easier to select build
configuration.
2018-07-13 15:23:59 +03:00
7486423e6d
Add CMakeSettings.json for MSVC 2017.
...
MSVC 2017 is binary-compatible with MSVC 2015, so it's safe to allow CMake to be used from within Visual Studio 2017.
2018-07-11 16:57:52 -05:00
7afa3690bf
Add support for DFHACK_BUILD_ID
...
Used for BuildMaster builds, for example
2018-07-11 11:47:55 -04:00
5d16e5a74c
Bump to 0.44.12-alpha1
2018-07-08 14:26:57 -04:00
d68354dc93
Bump to 0.44.12
2018-07-08 00:15:59 -04:00
00fa70dae9
Bump to beta2.1 (stonesense fix)
2018-07-07 21:42:01 -04:00
9bc8f4abdf
Bump to beta2
2018-07-07 19:45:21 -04:00
5a0d00d5d2
Bump to beta1, update scripts, update/fix changelog
2018-07-06 17:56:22 -04:00
Myk Taylor
Josh Cooper
Tim Siegel
Kelly Kinkade
lethosor
pre-commit-ci[bot]
Josh Cooper
Ben Lubar
Myk Taylor
Pauli