Commit Graph

59 Commits (c7826c8dddc21f1210f8a9a514b3396c9aec0cf5)

Author SHA1 Message Date
Paxton Schweigert 54769ebdbf Remove tinythread from PluginManager
Remove useless tinythread import in PlugLoad-windows.cpp

Remove seemingly useless tinythread import in LuaTools.cpp

Factor out tinythread in LuaApi.cpp

Removed unused tinythread in LuaWrapper.cpp

Removed unused tinythread include in LuaTypes.cpp

Removed unused tinythread include in ColorText.cpp

Factor out tinythread in Console.h

Factor out tinythread in Console-posix.cpp

Factor out tinythread in Console-windows.cpp

Factor out tinythread in renderer_light

Factor out tinythread in DataDefs.cpp

Remove unused tinythread include in RemoteClient.cpp

Add includes for new mutex and conditional_variable usages in PluginManager

Factor out tinythread from devel/memview, renderermax/renderer_light, and rendermax/renderer_opengl plugins

Remove usages of tinythread in various CMakeLists.txt files, in .ycm_extra_conf.py, and delete tinythread itself

Delete tinythread from LISCENSE.rst

excise tinythread: fix deadlock in pluginmanager

excise tinythread: remove improper header

excise tinythread: fix double unlock. fix plugin typo
2023-12-27 19:23:58 -05:00
Myk Taylor 6a50ae42ce
more deduplication of installed files 2023-07-29 00:35:12 -07:00
Myk Taylor 78448f438d
don't leak warning suppression out of protobuf 2023-06-25 17:53:16 -07:00
Myk 8f413628c2
reinstate alphabetical ordering 2023-06-19 17:40:40 -07:00
Myk Taylor ca9a0fb7d1
progress towards cpp20 2023-06-17 10:44:38 -07:00
myk002 dec6d3d379
Revert "update google protobuf to 3.21.10"
This reverts commit 9dabf51ac7.
2022-12-07 11:59:48 -08:00
myk002 9dabf51ac7
update google protobuf to 3.21.10 2022-12-07 11:59:15 -08:00
Myk Taylor cf24fc7829
ugh unit tests don't work on our OSX build either 2022-11-30 06:57:11 -08:00
Myk Taylor 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
Myk Taylor 5e745e2295
don't install gtest in the DF dir 2022-11-30 05:18:37 -08:00
Myk Taylor 68afe4d88f
only add unix flags on unix 2022-11-30 05:12:01 -08:00
myk002 ae035d5836
simplify unit testing setup 2022-11-28 17:16:48 -08:00
Josh Cooper 79551f7ef0 Updates CMake TESTING vars 2022-11-25 09:43:04 -08:00
Josh Cooper 9fdb2f7e47 Adds -Wno-sign-compare to gtest target 2022-11-25 09:43:04 -08:00
Josh Cooper 32b030e348 Adds -Wno-maybe-uninitialized to gtest target 2022-11-25 09:43:04 -08:00
Josh Cooper 268719ed1f Integrates googletest 2022-11-25 09:43:04 -08:00
myk002 1b426efdb9 reduce spurious warnings from libzip 2022-05-13 14:36:22 -07:00
Myk 8f6522899b
Upgrade jsoncpp to 1.9.5 (#2144)
* test jsoncpp upgrade

* use new json library target name

* don't remap the output dirs

* undo warnings at the source

* set new defaults for jsoncpp

* fix typo in new options

* fix signed comparison mismatch warning

* address random(?) compile failures

saying our std::atomic is not initialized in Debug.cpp
2022-05-13 13:52:43 -07:00
myk002 1dd567a169 only ignore the specific warning being generated
instead of -Wno-error
2022-02-05 16:07:47 -08:00
myk002 7cf055fcd0 avoid treating libexpat build warnings as errors
this effectively overrides the CMAKE EXPAT_WARNINGS_AS_ERRORS to be
treated as always OFF. since we currently add -Werror at the top-level
CMakeLists.txt file, that variable was previously effectively always ON.
Unless we want to be on the hook for solving libexpat build warnings, I
believe this way will avoid unnecessary build breakages for users.
2022-02-05 16:07:47 -08:00
myk002 c07c0eec10
add luacov link to license list, install luacov 2021-03-07 08:15:05 -08:00
Ben Lubar 67084de44b
add depends/lodepng 2021-02-24 17:58:31 -06:00
lethosor a7232499ac
Silence some warnings from GCC 10
Specifically `gcc (Ubuntu 10.2.0-13ubuntu1) 10.2.0`
2020-12-30 00:04:49 -05:00
lethosor 17432072f2
Also apply to xlsxio_write 2020-11-09 23:48:57 -05:00
lethosor aca2be7182
Disable MSVC warnings in dependencies 2020-11-09 23:41:43 -05:00
lethosor 7efadc85a6
Remove some unused config 2020-09-18 00:36:50 -04:00
lethosor b85759620f
Switch libzip and xlsxio to be included with add_subdirectory(), disable xlsxio installation 2020-09-18 00:33:41 -04:00
lethosor 1efa09582a
Change libexpat to be included with add_subdirectory()
- Confirmed that libexpat is built statically and linked with xlsxreader
- May need da7cda3a85 for Windows
- Although libexpat's CMake options are all prefixed with LIBEXPAT_, it also adds some cache entries like SIZE_T (from expat/ConfigureChecks.cmake). Unsure if these affect other libs.
- xlsxio may need additional reconfiguration after moving to add_subdirectory() to find libexpat/libzip on non-Linux platforms.
2020-09-17 00:25:50 -04:00
lethosor 94798a3620
Pass CMAKE_GENERATOR_TOOLSET to ExternalProject_Add instead 2020-08-22 10:38:29 -04:00
lethosor 5a77c9037e
Pass CMAKE_GENERATOR_TOOLSET (cmake -T argument) to external projects
The dependencies introduced in #1620 cause an error when building natively on Windows, according to @ragundo. CMake is looking for build tools `v100`, which are part of VS2010 and won't work with DF/DFHack, even if they were installed.

Some of the Windows build scripts pass in `-T v140_xp` (from VS2015), so passing this option through to subprojects may help: https://cmake.org/cmake/help/latest/variable/CMAKE_GENERATOR_TOOLSET.html
2020-08-21 19:49:33 -04:00
Myk Taylor 702228bf12 use standard CMAKE vars for prefixes and suffixes 2020-08-10 01:01:13 -07:00
Myk Taylor 6da364a60b ensure libexpat is used as a static lib 2020-08-10 00:01:47 -07:00
Myk Taylor 679ca41da8 make sure xlsxio knows to link statically 2020-08-09 21:22:17 -07:00
Myk Taylor a41f7c0998 convert XlsxReader module to xlsxreader plugin 2020-08-09 08:54:42 -07:00
Myk Taylor 5fc627a16f no lib prefix for libzip on windows too 2020-08-09 04:03:04 -07:00
Myk Taylor 7a0853025a use non-standard xlsxio lib name on windows 2020-08-09 03:30:59 -07:00
Myk Taylor 8913d43d6f ensure xlsxio_project gets built before dfhack 2020-08-09 02:59:22 -07:00
Myk Taylor f04a9c3180 clean up logging; use xlsxio's misspelling of "DIRS" 2020-08-09 02:32:31 -07:00
Myk Taylor 79415cf097 clean up dep lib vars 2020-08-09 02:24:05 -07:00
Myk Taylor 204240f3e3 specify expat include dir for xlsxio 2020-08-09 02:14:37 -07:00
Myk Taylor c7cf7fdd30 define EXPAT_LIBRARIES for xlsxio 2020-08-09 02:00:06 -07:00
Myk Taylor bb988d25e6 try to get the library suffix right for windows 2020-08-09 00:24:25 -07:00
Myk Taylor 51794d91ed really get the env vars 2020-08-08 23:55:24 -07:00
Myk Taylor b0cb40c5ea pass the cmake environment to deps 2020-08-08 22:42:50 -07:00
Myk Taylor 1cfe2735d3 build deps in verbose mode for debugging 2020-08-08 22:03:42 -07:00
Myk Taylor d65504eb82 ensure CFLAGS and CXXFLAGS get propagated to deps 2020-08-08 21:19:38 -07:00
Myk Taylor 8753f9feaf use correct lib dir on 32-bit 2020-08-08 20:42:03 -07:00
Myk Taylor 8a05f09cd6 add libexpat to the build 2020-08-08 20:18:43 -07:00
Myk Taylor 28eaf0ae8b add libzip to the build 2020-08-08 20:04:46 -07:00
Myk Taylor 89a6309788 build xlsxio and link it into dfhack, add lua api 2020-08-08 15:24:12 -07:00