AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Add a CompilerCapabilities.h.in file which is filled in by CMake

Browse Source 
It will #define a each of the basic features detected by CMake which can
then be used by other headers (like TypeDef.h) to set things up for
PolyVox.

It is this file which you will have to manually edit and rename if you want
to skip using CMake.
This commit is contained in:
Matt Williams
2012-11-23 11:45:13 +00:00
parent 596bf12877
commit 3902e00a0f
10 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/PolyVoxCore/CMakeLists.txt
View File

@ -24,6 +24,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(PolyVoxCore)
#Set up the C++11 feature header file based on the CheckCXX11Features script
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/PolyVoxCore/Impl/CompilerCapabilities.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/PolyVoxCore/Impl/CompilerCapabilities.h)
#Projects source files
SET(CORE_SRC_FILES
source/ArraySizes.cpp
@ -128,7 +131,7 @@ SOURCE_GROUP("Sources\\Impl" FILES ${IMPL_SRC_FILES})
SOURCE_GROUP("Headers\\Impl" FILES ${IMPL_INC_FILES})
#Tell CMake the paths
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/include)
#Core
#Build

6
library/PolyVoxCore/include/PolyVoxCore/Impl/CompilerCapabilities.h.in Normal file
View File

@ -0,0 +1,6 @@
#ifndef __PolyVox_CompilerCapabilities_H__
#define __PolyVox_CompilerCapabilities_H__
#cmakedefine HAS_CXX11_CONSTEXPR
#endif

2
library/PolyVoxCore/include/PolyVoxCore/Impl/TypeDef.h
View File

@ -24,6 +24,8 @@ freely, subject to the following restrictions:
#ifndef __PolyVox_TypeDef_H__
#define __PolyVox_TypeDef_H__
#include "PolyVoxCore/Impl/CompilerCapabilities.h"
//Definitions needed to make library functions accessable
// See http://gcc.gnu.org/wiki/Visibility for more info.
#if defined _WIN32 || defined __CYGWIN__