Commit Graph

241 Commits (master)

Author SHA1 Message Date
Harald H 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
David Cernat 656453725b
Merge pull request #343 from OpenMW/master
Add OpenMW commits up to 23 Nov 2017
7 years ago
jbo-85 f896c9acb6 Fix search paths in FindSDL2.cmake to find SDL2 built from source 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 5ceaaabeb2 Remove MESSAGE calls I accidentally left in 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 b847914d6f [General] Fix finding CallFF includes 8 years ago
Koncord 1c09e0c255 [Server] Add CallFF dependency 8 years ago
Koncord 9506f9ca35 [General] Allow luajit-2.1 8 years ago
Koncord 2d91c60a11 [General] Change "Lib" to "lib" in FindRakNet cmake module 8 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
David Cernat 1d83098619 [Build] Use slilghtly retooled version of CMake's default FindLua51 8 years ago
David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
8 years ago
Nikolay Kasyanov 7f429f26e1 Allow getting available version information even when clone is shallow 8 years ago
David Cernat fb34e2c4ba Revert "[Build] Fix for MSYS2 build while maintaining MSVC fix"
This reverts commit faf1c416f3.
8 years ago
Battlerax faf1c416f3 [Build] Fix for MSYS2 build while maintaining MSVC fix 8 years ago
Battlerax b47260f9dc [Build] Fixed linker issue 8 years ago
David Cernat 213bc1e733 Print correct variable for Terra's library 8 years ago
David Cernat 10a0f165dd Print paths used for server dependencies in CMake, change tabs to spaces 8 years ago
Koncord cbae39412a Fix RakNet module 8 years ago
U-VirtualBox-PC\Admin 6229269506 Some patches for lua on windows 8 years ago
David Cernat 436548413e Resolve conflicts in pull request #39
# Conflicts:
#	CMakeLists.txt
8 years ago
scrawl b26478b860 Merge pull request #1028 from kpp/find_osg_plugins
Find osg_plugins
8 years ago
scrawl ec14fe4d4c Merge pull request #1026 from kpp/find_sphinx
Fix FindSphinx.cmake
8 years ago
Roman Proskuryakov 0d83121a6f Removes unused FindPkgMacros 8 years ago
Roman Proskuryakov 95dc1258d6 Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library 8 years ago
Roman Proskuryakov ed2c2170f0 Rewrites FindSDL2 using LibFindMacros 8 years ago
Roman Proskuryakov 3df57b1833 Fixes LibFindMacros for libfind_process 8 years ago
Roman Proskuryakov 2311969f05 Reduce the number of copypaste in FindSphinx.cmake 8 years ago
David Cernat d9cfd5bac2 Resolve conflicts with OpenMW 8 years ago
scrawl a44ba0e461 Merge pull request #966 from kpp/find_mygui
Find mygui
8 years ago
Roman Proskuryakov e0e69a8d8a Rewrites FindMyGUI with LibFindMacros 8 years ago
David Cernat 8686b9cc12 Merge pull request #29 from OpenMW/master
Add OpenMW commits from end of July
9 years ago
Koncord 1f0d6eba80 Fix FindRakNet
Added ws2_32 for Windows
Fixed path to headers
9 years ago
Aesylwinn b4a000913c Merge remote-tracking branch 'yar/master' into Even
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
9 years ago
Koncord 1a32385632 Fix cmake modules 9 years ago
Koncord 1b259e2d33 Syncing inventory, animations, position, 8 key attributes
Created Package system
9 years ago
Koncord 1e29409dd5 Add OpenMW-mp target 9 years ago
Bret Curtis ac8d347e9e we have html output and autodoc functionality 9 years ago
Roman Proskuryakov 39963a2c85 Removes PreprocessorUtils.cmake
Replaces get_version_from_n_defines -> libfind_version_n_header
9 years ago
Roman Proskuryakov 4d0544e61a Adds FindTinyXML.cmake 9 years ago
Roman Proskuryakov 57b75d2cd1 Teaches LibFindMacros to find version from 'const int NAME = 42;' 9 years ago
Roman Proskuryakov edb41b5b08 Rewrites FindLIBUNSHIELD using LibFindMacros
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
9 years ago
Roman Proskuryakov 3bcd23022a Rewrites FindBullet using LibFindMacros handling version properly 9 years ago
Roman Proskuryakov 280b20ccb7 Fix libfind_process for quiet packages 9 years ago
Roman Proskuryakov f23b551bfa Rename FFMPEG_SDK -> FFMPEG_HOME as it is said in wiki
Fix #942
9 years ago
Roman Proskuryakov 63ca8b73fc fix: use Freetype in FindMYGUI instead of FREETYPE 9 years ago
Roman Proskuryakov bd804d30a4 Rewrites FindFreetype using LibFindMacros 9 years ago
Roman Proskuryakov da59ef0f67 Rewrites FindFFmpeg using LibFindMacros handling components properly 9 years ago
Roman Proskuryakov 81dd164006 Adds CMake module LibFindMacros to reduce pain in find modules 9 years ago
Roman Proskuryakov 16fbce91c2 Implements macro get_version_from_n_defines inside PreprocessorUtils 9 years ago
scrawl 9eb96b9cb6 Parse the bullet version in FindBullet.cmake 9 years ago
Hristos N. Triantafillou 97bcdf7904 Properly find MyGUI in /usr/local/lib 9 years ago
sandstranger 48f4fc34eb build fixes for Android 9 years ago
sandstranger bd5057aa3c enable opengl es1 9 years ago
Nikolay Kasyanov fff6b5fde1 OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough 9 years ago
Sebastian Wick b68f64ed97 adjust FindMyGUI.cmake to correctly handle REQUIRED and QUIETLY 9 years ago
Nikolay Kasyanov c868010c20 OS X: don't consider libs from `/usr/local` as "system dependencies" during packaging
Otherwise they won't be moved into final application bundle.
10 years ago
Nikolay Kasyanov 5fba7400a6 Borrow modified bundle utilities from https://github.com/Slicer/Slicer
They support dependencies with @rpath
10 years ago
Marc Zinnschlag b3ad983f1f Merge remote-tracking branch 'scrawl/version'
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
scrawl f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
10 years ago
slothlife 83ef1f7eea Add support for linking OpenSceneGraph statically
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
10 years ago
scrawl 71509d2497 Remove cmake script Ogre leftovers 10 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 10 years ago
scrawl 4f0387bdb5 Fix for recent merge 10 years ago
scrawl 974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl b75d993da4 Fix for BULLET_DYNAMICS_LIBRARY cmake leftover 10 years ago
scrawl 1f00174c02 Use a btCollisionWorld instead of btDiscreteDynamicsWorld
Slightly improves performance, since we no longer need to stepSimulation(). We don't use any Dynamics (yet).
10 years ago
k1ll 31db37afd4 FindMygui mingw 10 years ago
scrawl 48a6d7c1a0 Remove mygui platform libraries from cmake 10 years ago
scrawl 4e69e7cc0f OpenMW compiles and runs w/o render window 10 years ago
scrawl 9d07edda13 UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04 10 years ago
Marco Schulze 3024c67995 Regenerate components/version/version.hpp as HEAD moves on a git checkout
Pull request #416 introduced a common bug where version.hpp wouldn't be
regenerated every build, poteantially leading to stale version data. This
commit adds a custom build target, git-version, which updates version.hpp
before the components library is built.
10 years ago
Marco Schulze d92cd2ffad Remove GetGitRevisionDescription.cmake
GetGitRevisionDescription.cmake uses a somewhat contrived method to obtain the
hash of the commit pointed by the repository's HEAD. This method fails on
unusual, but still valid repository layouts.

This commit removes cmake/GetGitRevisionDescription.cmake{,.in}, replacing its
functionality with direct use of Git's plumbing.
10 years ago
cc9cii 69d0c7fd70 Cleanup leftover from previous osx support attempts. 10 years ago
cc9cii 5889fd5bd9 Try hard coding OSX paths. 10 years ago
cc9cii 142a825ad6 For OSX support. 10 years ago
cc9cii 6b9b02dc1a Giving up, revert CMake changes. 10 years ago
cc9cii 0171bde363 Another variation. 10 years ago
cc9cii c7e57e8d88 Another attempt for osx build. 10 years ago
cc9cii f29227629a Experimenting with FindOGRE for osx. 10 years ago
cc9cii f459adf117 Revert CMake changes (didn't work for osx anyway) 10 years ago
cc9cii 758ce0ed98 Various fixes as per feedback comments. 10 years ago
cc9cii 3aea1bf5f9 CMake changes for using Ogre Overlay. 10 years ago