From 29d1cd8ad1e07e47cee0b1eb00c7b890d687b0f4 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Sun, 25 May 2008 20:56:35 +0000 Subject: [PATCH] Fix PolyVox library versioning There's no need to link PolyVox against 'nothing' --- CMakeLists.txt | 9 +++++++-- source/Region.cpp | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22c3fb3e..fcf0439b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,10 @@ PROJECT(PolyVox) +SET(POLYVOX_VERSION_MAJOR "0") +SET(POLYVOX_VERSION_MINOR "1") +SET(POLYVOX_VERSION_PATCH "0") +SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX_VERSION_PATCH}") + #Projects source files SET(SRC_FILES source/IndexedSurfacePatch.cpp @@ -64,8 +69,8 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/include) #Build ADD_LIBRARY(PolyVox SHARED ${SRC_FILES} ${INC_FILES}) -TARGET_LINK_LIBRARIES(PolyVox) -SET_TARGET_PROPERTIES(PolyVox PROPERTIES VERSION ${THERMITE_VERSION} SOVERSION ${THERMITE_VERSION_MAJOR}) +#TARGET_LINK_LIBRARIES(PolyVox) +SET_TARGET_PROPERTIES(PolyVox PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR}) IF(WIN32) SET_TARGET_PROPERTIES(PolyVox PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports ENDIF(WIN32) diff --git a/source/Region.cpp b/source/Region.cpp index a0d1072b..6ce274ba 100644 --- a/source/Region.cpp +++ b/source/Region.cpp @@ -63,4 +63,4 @@ namespace PolyVox m_v3dUpperCorner.setY((std::min)(m_v3dUpperCorner.y(), other.m_v3dUpperCorner.y())); m_v3dUpperCorner.setZ((std::min)(m_v3dUpperCorner.z(), other.m_v3dUpperCorner.z())); } -} \ No newline at end of file +}