090f13b334
Fix CMake files to allow build server only
5 years ago
6fdef4fd0a
Add OpenMW commits up to 1 Jan 2019
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
84cab59057
Add OpenMW commits up to 19 Aug 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/main.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/misc/debugging.hpp
5 years ago
a58a8db030
Uncomment commented lines
6 years ago
9067731a96
Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY (i.e. that it can now be a list) while allowing for the possibility that the found libraries may be in different directories when debug and optimised versions exist.
6 years ago
ef631a0961
Add dependency for GMock
6 years ago
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
7 years ago
467989cdd5
Moved crashcatcher to a component and also use it in CS
...
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
7 years ago
533cd9cdec
[General] Fix FindRakNet
7 years ago
470ea50b54
[General] Use LuaJit instead default Lua
7 years ago
a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
7 years ago
62877f38b7
[General] Remove Terra support
...
Use LuaJIT instead.
7 years ago
7cafec9861
Add support for msvc with cmake version pre 3.9 ( fixes #4429 )
7 years ago
365f485e8d
Merge pull request #397 from OpenMW/master while resolving conflicts
...
Conflicts:
components/CMakeLists.txt
7 years ago
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
7 years ago
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
7 years ago
656453725b
Merge pull request #343 from OpenMW/master
...
Add OpenMW commits up to 23 Nov 2017
7 years ago
f896c9acb6
Fix search paths in FindSDL2.cmake to find SDL2 built from source
7 years ago
37304655da
Merge pull request #326 from OpenMW/master
...
Add OpenMW commits up to 25 Oct 2017
7 years ago
daf7d8451c
Switch to a more reliable method of passing the git-version targt the data it needs
7 years ago
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
a52c485090
Fix list length error
7 years ago
6af8ad70a5
Remove superfluous copy_all_files macro
7 years ago
76c4ff983a
Fix getting cmake property as variable
7 years ago
1f86fa3c31
Fix resource copying on non-MSVC targets
7 years ago
b00b94f0db
Use CMAKE_CONFIGURATION_TYPES instead of manually listing the possible configuration types.
7 years ago
f9a3562ccd
Remove duplicate macro definition and fix warning
7 years ago
5ceaaabeb2
Remove MESSAGE calls I accidentally left in
7 years ago
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
afbdc27a34
Move calls to cmake_minimum_required as early in the CMake process as possible.
7 years ago
de14e43680
Seemingly fix everything by setting policies that were unset upon entering the macro
7 years ago
33c77d7a2a
Try using cmake_parse_arguments to make the macro work
7 years ago
c9f099ce07
Change CMake version check to include 3.8
7 years ago
5ce34f1cbf
Move new behaviour into macro to reduce code duplication
7 years ago
b847914d6f
[General] Fix finding CallFF includes
8 years ago
1c09e0c255
[Server] Add CallFF dependency
8 years ago
9506f9ca35
[General] Allow luajit-2.1
8 years ago
2d91c60a11
[General] Change "Lib" to "lib" in FindRakNet cmake module
8 years ago
056ec2d434
[General] Fix CMake errors
8 years ago
a27815fa7d
[General] Allow backslashes in add_component_dir to specify subgroups
8 years ago
505905ab7d
[General] Allow backslashes in add_openmw_dir to specify subgroups
8 years ago
1d83098619
[Build] Use slilghtly retooled version of CMake's default FindLua51
8 years ago
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
8 years ago
7f429f26e1
Allow getting available version information even when clone is shallow
8 years ago
fb34e2c4ba
Revert "[Build] Fix for MSYS2 build while maintaining MSVC fix"
...
This reverts commit faf1c416f3
8 years ago
faf1c416f3
[Build] Fix for MSYS2 build while maintaining MSVC fix
8 years ago
b47260f9dc
[Build] Fixed linker issue
8 years ago
213bc1e733
Print correct variable for Terra's library
8 years ago
Koncord
David Cernat
AnyOldName3
elsid
Doc West
Koncord
Cédric
bret curtis
Harald H
jbo-85
AnyOldName3
krizd
Nikolay Kasyanov
Battlerax