David Cernat
|
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 |
Doc West
|
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 |
David Cernat
|
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 |
Cédric
|
7cafec9861
|
Add support for msvc with cmake version pre 3.9 (fixes #4429)
|
7 years ago |
David Cernat
|
37304655da
|
Merge pull request #326 from OpenMW/master
Add OpenMW commits up to 25 Oct 2017
|
7 years ago |
AnyOldName3
|
daf7d8451c
|
Switch to a more reliable method of passing the git-version targt the data it needs
|
7 years ago |
David Cernat
|
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 |
AnyOldName3
|
a52c485090
|
Fix list length error
|
7 years ago |
AnyOldName3
|
6af8ad70a5
|
Remove superfluous copy_all_files macro
|
7 years ago |
AnyOldName3
|
76c4ff983a
|
Fix getting cmake property as variable
|
7 years ago |
AnyOldName3
|
1f86fa3c31
|
Fix resource copying on non-MSVC targets
|
7 years ago |
AnyOldName3
|
b00b94f0db
|
Use CMAKE_CONFIGURATION_TYPES instead of manually listing the possible configuration types.
|
7 years ago |
AnyOldName3
|
f9a3562ccd
|
Remove duplicate macro definition and fix warning
|
7 years ago |
AnyOldName3
|
f8fe992dc0
|
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
|
7 years ago |
David Cernat
|
bd541b1e5b
|
Merge pull request #287 from OpenMW/master while resolving conflicts
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
|
7 years ago |
AnyOldName3
|
afbdc27a34
|
Move calls to cmake_minimum_required as early in the CMake process as possible.
|
7 years ago |
AnyOldName3
|
de14e43680
|
Seemingly fix everything by setting policies that were unset upon entering the macro
|
7 years ago |
AnyOldName3
|
33c77d7a2a
|
Try using cmake_parse_arguments to make the macro work
|
7 years ago |
krizd
|
c9f099ce07
|
Change CMake version check to include 3.8
|
7 years ago |
AnyOldName3
|
5ce34f1cbf
|
Move new behaviour into macro to reduce code duplication
|
7 years ago |
Koncord
|
056ec2d434
|
[General] Fix CMake errors
|
8 years ago |
Koncord
|
a27815fa7d
|
[General] Allow backslashes in add_component_dir to specify subgroups
|
8 years ago |
Koncord
|
505905ab7d
|
[General] Allow backslashes in add_openmw_dir to specify subgroups
|
8 years ago |
scrawl
|
9089df3080
|
Add unity build option
Each component and each MW-subsystem will be used as a single compilation unit.
|
11 years ago |
Alexander "Ace" Olofsson
|
d5aa975675
|
Fix some issues that seem to have appeared in the CMake configuration.
|
12 years ago |
Michal Sciubidlo
|
f7e5ea24f4
|
Merge branch 'startup' into cs_load.
Fix include in textinputdialog.cpp.
|
12 years ago |
Marc Zinnschlag
|
a002b253d1
|
silenced a cmake warning
|
12 years ago |
Marc Zinnschlag
|
a4872e3217
|
rewrote the opencs cmake scripts (more compact and no more annoying warnings)
|
12 years ago |
Michal Sciubidlo
|
f029a9011a
|
Move datafilespage to shared space.
|
12 years ago |
scrawl
|
17a5c22c8f
|
don't use globbing
|
13 years ago |
scrawl
|
4ea6530772
|
hello world.
|
13 years ago |
Marc Zinnschlag
|
61dd1922b0
|
more specific cmake source file GLOBing
|
13 years ago |
Pieter van der Kloet
|
ea241d85ef
|
Fixed some issues with the CMake files
|
13 years ago |
Marc Zinnschlag
|
cb1373a4c7
|
rewrote cmake scripts for components
|
13 years ago |
Alexander "Ace" Olofsson
|
255f948bae
|
A small fix to add all the files and not just the first one CMake finds
|
13 years ago |
Marc Zinnschlag
|
dc878e2c30
|
testing MSVC fix, another try
|
13 years ago |
Marc Zinnschlag
|
77d1f1f8a1
|
testing MSVC fix
|
13 years ago |
Marc Zinnschlag
|
ad086312b8
|
testing: cmake script simplification
|
13 years ago |