Add missing headers causing compile errors on Linux

Don't build GL example at all on Linux
Add PolyVoxConfig.cmake file
This commit is contained in:
Matt Williams 2008-11-22 20:09:59 +00:00
parent 68d0353cff
commit 7c9cefc2d6
7 changed files with 49 additions and 12 deletions

View File

@ -5,6 +5,4 @@ PROJECT(PolyVox)
#ADD_SUBDIRECTORY(PolyVoxCore)
#ADD_SUBDIRECTORY(PolyVoxUtil)
ADD_SUBDIRECTORY(library)
ADD_SUBDIRECTORY(examples/OpenGL)
ADD_DEPENDENCIES(OpenGLExample PolyVoxCore)
ADD_SUBDIRECTORY(examples/OpenGL)

View File

@ -16,9 +16,9 @@ SET(CMAKE_DEBUG_POSTFIX "_d")
SOURCE_GROUP("Sources" FILES ${SRC_FILES})
#SOURCE_GROUP("Headers" FILES ${INC_FILES})
FIND_PACKAGE(OpenGL REQUIRED)
IF (WIN32)
FIND_PACKAGE(OpenGL REQUIRED)
#NOTE: In Windows I haven't had much luck getting the FindGLUT script to work correctly.
#The easiest solution has been to install GLUT alongside OpenGL, which is already in the system path.
#This means glut.h and glut32.lib go in the 'include' and 'lib' folders within Microsoft Visual Studio 8\VC\PlatformSDK\
@ -32,11 +32,13 @@ IF (WIN32)
#Build
ADD_EXECUTABLE(OpenGLExample ${SRC_FILES})
TARGET_LINK_LIBRARIES(OpenGLExample glut32.lib ${OPENGL_gl_LIBRARY} debug PolyVoxCore_d.lib optimized PolyVoxCore.lib)
ENDIF (WIN32)
#Install
INSTALL(TARGETS OpenGLExample
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
#Install
INSTALL(TARGETS OpenGLExample
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
ADD_DEPENDENCIES(OpenGLExample PolyVoxCore)
ENDIF (WIN32)

View File

@ -124,3 +124,13 @@ INSTALL(TARGETS PolyVoxUtil
)
INSTALL(FILES ${UTIL_INC_FILES} DESTINATION include/PolyVoxUtil)
#Set up OGREConfig.cmake
if(WIN32)
set(CONFIG_FILE_DIR "CMake")
else(WIN32)
set(CONFIG_FILE_DIR "lib/PolyVox/CMake")
endif(WIN32)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PolyVoxConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PolyVoxConfig.cmake)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PolyVoxConfig.cmake DESTINATION ${CONFIG_FILE_DIR})

View File

@ -0,0 +1,23 @@
# Find PolyVox includes and library
#
# This module defines
# PolyVox_INCLUDE_DIRS
# PolyVox_LIBRARIES, the libraries to link against to use OGRE.
# PolyVox_LIBRARY_DIRS, the location of the libraries
# PolyVox_FOUND, If false, do not try to use OGRE
#
# Copyright © 2008, Matt Williams
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
include(FindPackageMessage)
set(PREFIX "@CMAKE_INSTALL_PREFIX@")
set(PolyVox_LIBRARY_DIRS "${PREFIX}/lib")
set(PolyVox_INCLUDE_DIRS "${PREFIX}/include/PolyVoxCore" "${PREFIX}/include/PolyVoxUtil")
set(PolyVox_LIBRARIES "PolyVoxUtil" "PolyVoxCore")
message(STATUS "Found PolyVox")
message(STATUS " libraries : '${PolyVox_LIBRARIES}' from ${PolyVox_LIBRARY_DIRS}")
message(STATUS " includes : ${PolyVox_INCLUDE_DIRS}")

View File

@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "Block.h"
#include "BlockVolume.h"
#include "Vector.h"
#include "Region.h"
#pragma endregion
namespace PolyVox

View File

@ -26,6 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "PolyVoxForwardDeclarations.h"
#include <cassert>
namespace PolyVox
{
POLYVOX_API uint8 logBase2(uint32 uInput);

View File

@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <cassert>
#include <cmath>
#include <string>
#include <cstring>
namespace PolyVox
{