From f8a090abbae389358166aca5ba80a37803d913a6 Mon Sep 17 00:00:00 2001
From: David Williams <david@david-williams.info>
Date: Sun, 8 Jun 2008 19:48:39 +0000
Subject: [PATCH] Moving stuff around - not currently buildable!

---
 CMakeLists.txt                 |  6 +++---
 PolyVoxCore/CMakeLists.txt     | 15 ++++++---------
 examples/OpenGL/CMakeLists.txt | 15 +++++++++++----
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 610e7507..f3cfd05c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-PROJECT(PolyVoxProject)
+PROJECT(PolyVox)
 
-ADD_SUBDIRECTORY(library)
+ADD_SUBDIRECTORY(PolyVoxCore)
 ADD_SUBDIRECTORY(examples/OpenGL)
 
-ADD_DEPENDENCIES(OpenGLExample PolyVox)
\ No newline at end of file
+ADD_DEPENDENCIES(OpenGLExample PolyVoxCore)
\ No newline at end of file
diff --git a/PolyVoxCore/CMakeLists.txt b/PolyVoxCore/CMakeLists.txt
index 57b9cab9..3ac8a155 100644
--- a/PolyVoxCore/CMakeLists.txt
+++ b/PolyVoxCore/CMakeLists.txt
@@ -1,14 +1,12 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-PROJECT(PolyVox)
+PROJECT(PolyVoxCore)
 
 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}")
 
-#ADD_SUBDIRECTORY(examples/OpenGL)
-
 #Projects source files
 SET(SRC_FILES
 	source/IndexedSurfacePatch.cpp
@@ -72,18 +70,17 @@ SOURCE_GROUP("Headers" FILES ${INC_FILES})
 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 ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR})
+ADD_LIBRARY(PolyVoxCore SHARED ${SRC_FILES} ${INC_FILES})
+SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR})
 IF(WIN32)
-	SET_TARGET_PROPERTIES(PolyVox PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports
+	SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports
 ENDIF(WIN32)
 
 #Install
-INSTALL(TARGETS PolyVox
+INSTALL(TARGETS PolyVoxCore
 	RUNTIME DESTINATION bin
 	LIBRARY DESTINATION lib
 	ARCHIVE DESTINATION lib
 )
 
-INSTALL(FILES ${INC_FILES} DESTINATION include/PolyVox)
+INSTALL(FILES ${INC_FILES} DESTINATION include/PolyVoxCore)
diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt
index 1096889c..407caa8c 100644
--- a/examples/OpenGL/CMakeLists.txt
+++ b/examples/OpenGL/CMakeLists.txt
@@ -26,11 +26,18 @@ IF (WIN32)
 	#Also, glut32.dll goes in C:\Windows\System. Using C:\Windows\System32 doesn't seem to work
 	
 	#Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location)
-	INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} "../../library/include")
+	INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIR} "../../PolyVoxCore/include")
 	#No idea  why we have to look three levels up for build and only two for include. They should be the same level?!
-	LINK_DIRECTORIES("../../../build/library")
+	LINK_DIRECTORIES("../../../build/PolyVoxCore")
 
 	#Build
 	ADD_EXECUTABLE(OpenGLExample ${SRC_FILES})
-	TARGET_LINK_LIBRARIES(OpenGLExample glut32.lib ${OPENGL_gl_LIBRARY} debug PolyVox_d.lib optimized PolyVox.lib)
-ENDIF (WIN32)
\ No newline at end of file
+	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
+)
\ No newline at end of file