Commit Graph

122 Commits

Author SHA1 Message Date
0e995b5140 Fixed some compiler warnings. 2015-03-21 07:40:32 +01:00
09c15173f9 Simplify -std=c++0x flag logic
This could be improved in CMake 3.1 by using CXX_STANDARD and
CXX_STANDARD_REQUIRED (see http://stackoverflow.com/a/20165220/96704)
2015-02-28 10:55:01 +00:00
41d5ea6178 Move FindQt5Test logic inside tests directory 2015-02-28 10:40:05 +00:00
d9dae773dc Simplify the BUILD_EXAMPLES logic 2015-02-28 10:24:32 +00:00
32b07659a8 Move all the examples' CMake logic into the examples directory 2015-02-28 10:19:17 +00:00
969310f327 Make sure we're notifiying if the docs are available 2015-02-28 10:17:56 +00:00
65f966555d Move Doxygen stuff into include directory where it is actually used 2015-02-28 10:06:56 +00:00
cb1cd58288 Remove all mention of LIBRARY_TYPE as PolyVox is now header-only 2015-02-28 09:56:12 +00:00
3f849e19a4 Started refactoring examples and got DecodeOnGPUExample working. 2015-02-15 12:03:31 +01:00
92daf9a0c0 Fixed CMake script for DecodeOnGPU example, though it's currently disabled due to compile errors. 2015-02-14 09:30:59 +01:00
41498cfcb8 Removed GLEW from repository. 2015-02-09 23:22:12 +01:00
c62bde0066 Work on getting the OpenGL/Qt5 support working with new header-only library. 2015-02-09 22:11:06 +01:00
97bd3a232a Renamed 'library' folder to 'include' (as it just contains headers now). 2015-02-07 15:21:33 +01:00
630affbf4d Moved bindings from inside 'library' folder to root folder. 2015-02-07 14:47:21 +01:00
6d6b190743 Reorganise the CMake scripts to make sure the core library is independent 2014-12-10 15:53:25 +00:00
86357d66b7 Normalized line endings 2014-09-25 22:38:01 +02:00
b635e9d29d Copied BasicExample as base for new 'DecodeOnGPU' example. 2014-05-29 12:20:33 +02:00
2da902d5f9 This change reverts PolyVox back to using Qt 4.8. This is expected to be a temporary change, required because moving to Qt 5 caused various complications on Windows which we are not yet ready to address.
For more details see here: https://bitbucket.org/volumesoffun/polyvox/issue/41/upgrade-to-qt-5
2014-05-05 20:29:52 +02:00
45302fde02 Qt is not REQUIERD. This was causing errors. 2014-03-27 10:24:29 +00:00
868fbb84a0 Update to use Qt5
The examples and tests now use Qt5. This allows some nice tidying of the
CMake files, some of which will come in future.

Closes issue #41
2014-03-09 18:02:24 +00:00
00d1b8e10c Update required CMake version to 2.8.6 2014-03-09 17:55:14 +00:00
cec740f429 Remove search for Boost
We don't use Boost anywhere any more so don't try to search for it.
2014-03-09 17:54:17 +00:00
bc17c802bb Assume C++11 support
Remove all CMake checks for C++11 support since we now assume that we have it.
Replace all polyvox_* macros with standard C++ names.

See #48
2014-02-14 15:03:26 +00:00
d96dcaa531 Another Mac/Clang fix. 2013-12-31 14:53:53 +01:00
1cb486cb33 Fixed Clang detection. 2013-12-31 11:19:00 +01:00
8ad0cae89a Add an example which uses the Python bindings
This is more or less a copy of the BasicExample but using ever so slightly more
modern OpenGL (>=3.0). I've tried to comment this as much as possible.

In addition to this simple example I will go on to develop a more complex
application as discussed in issue #21
2013-01-19 14:24:10 +00:00
de26bb4b9c Merge branch 'hotfix/v0.2.1' into develop
Conflicts:
	library/PolyVoxCore/include/PolyVoxCore/LargeVolume.inl
	library/PolyVoxCore/include/PolyVoxCore/RawVolumeSampler.inl
	library/PolyVoxCore/include/PolyVoxCore/SimpleVolume.inl
2012-12-27 01:08:46 +00:00
8747c05be9 Bump version number to 0.2.1 2012-12-27 00:04:40 +00:00
9e7bb75687 Disable the C++11 feature detection on Visual Studio
There seems to be a bug in the interaction between CMake and Visual Studio
which floods the 'recent projects' list with the TRY_COMPILE projects.

If in the future this is fixed then it can re-enabled.
2012-12-26 15:40:59 +00:00
74f25eac23 Merge branch 'develop' into feature/cmake-cxx11-detect
Conflicts:
	examples/Basic/CMakeLists.txt
	examples/OpenGL/CMakeLists.txt
	examples/Paging/CMakeLists.txt
	examples/SmoothLOD/CMakeLists.txt
	library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
2012-12-24 20:08:31 +00:00
989cd453fe Consolidate glew into one location to speed up build. 2012-11-23 23:01:50 +00:00
596bf12877 Run the feature detection at CMake time 2012-11-23 15:41:25 +00:00
f722640a5a Bump version number to 0.2.0 2012-11-19 12:12:35 +00:00
d4edc1047e Renamed 'PolyVoxImpl' to just 'Impl'. 2012-11-05 17:00:09 +01:00
2e71019d8f Don't fail if Qt isn't installed
If Qt isn't installed, set the reporting variables correctly but don't fail.
2012-10-25 20:10:37 +01:00
480c159327 Add copyright headers to all the CMake files 2012-08-24 13:20:41 +01:00
b96309f4a4 Use the CMake folder tool to help IDEs groupt targets.
This is done as seen in http://athile.net/library/blog/?p=288

Hopefully this works in Visual Studio as KDevelop doesn't use this feature.
2012-08-12 04:29:51 +01:00
8ac27912ae Fix CMake files so it actually works on CMake 2.8.3 2012-07-23 11:11:31 +01:00
42d2a777ac Mark some internal variables as advanced in CMake
This stops them from appearing by default in cmake-gui and ccmake.
2012-07-19 19:56:40 +01:00
f11b4e17c1 Build only one of static or shared libraries
As discussed on the forums, to simplify the CMake code and avoid having to
manually specify dependencies this removes the hack to allow both static
and shared libraries to be built at the same time.

It introduces the new variable LIBRARY_TYPE which can be either STATIC or
DYNAMIC.

See: http://www.volumesoffun.com/phpBB3/viewtopic.php?p=3203#p3203
2012-07-19 17:33:34 +01:00
b9087ec6bf Fix a few BUILD_→ENABLE_ changes that I missed 2012-07-17 20:26:00 +01:00
d7fc289035 Convert CMake variables from YES/NO to ON/OFF 2012-07-15 21:14:37 +01:00
2b5024591e Move some feature_summary stuff around
Move set_package_properties and add_feature_info calls around to more
sensible ordering and positions.
2012-07-15 21:10:31 +01:00
6fd7079e7c Update minimum CMake version and documentation. 2012-07-15 20:37:13 +01:00
ca6f98c339 Add preliminary feature_summary work
This uses a built-in command for displaying features.
2012-07-15 20:14:15 +01:00
11685a1874 Rename BUILD_TESTING to ENABLE_TESTS and WITH_BINDINGS to ENABLE_BINDINGS
This is for future consistency where ENABLE_ variables will denote optional
components of PolyVox and WITH_ variables denote optionally using features
provided by external libraries (e.g. OGRE compatibility).
2012-06-26 17:08:44 +01:00
c681fac66a Add option to disable building the bindings.
If you want to disable them, even if SWIG and Python were both found, set
WITH_BINDINGS to NO with -DWITH_BINDINGS=NO or in the CMake GUI.
2012-06-21 20:31:04 +01:00
baa1743d8f Enable C++11 support for Clang 2012-02-25 22:42:05 +00:00
ccfa7db1fa Initial commit of VolumeResampler and LOD demo. 2011-07-02 12:39:04 +01:00
7d76a1bb69 CMake fixes for Windows. 2011-04-28 11:56:33 +01:00