Merge pull request #5 from torss/master

Minor CMake fixes / improvements

Author: John

BinaryMeshFitting/CMakeDeps.cmake

@@ -1,2 +1,2 @@
 # File generated by CMake process
-set(sources BinaryChunk.cpp;Chunk.cpp;ChunkGenerator.cpp;ColorMapper.cpp;Core.cpp;CubicChunk.cpp;DebugScene.cpp;DualChunk.cpp;DynamicGLChunk.cpp;Entry.cpp;FPSCamera.cpp;GLChunk.cpp;ImplicitSampler.cpp;MeshProcessor.cpp;NoiseSampler.cpp;PCH.cpp;WorldOctree.cpp;WorldOctreeNode.cpp;WorldStitcher.cpp;WorldWatcher.cpp)
+set(sources ChunkGenerator.cpp;ColorMapper.cpp;Core.cpp;DMCChunk.cpp;DebugScene.cpp;DynamicGLChunk.cpp;Entry.cpp;FPSCamera.cpp;Frustum.cpp;GLChunk.cpp;ImplicitSampler.cpp;MeshProcessor.cpp;NoiseSampler.cpp;PCH.cpp;Texture.cpp;WorldOctree.cpp;WorldOctreeNode.cpp;WorldStitcher.cpp;WorldWatcher.cpp)

BinaryMeshFitting/CMakeLists.txt

@@ -20,6 +20,10 @@ find_package(GLM REQUIRED)
 find_package(Vc REQUIRED)
 find_package(FastNoiseSIMD REQUIRED)
 
+set_target_properties(${name} PROPERTIES
+ VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+ )
+
 target_include_directories(${name} PRIVATE
  ${GLEW_INCLUDE_DIRS}
  ${GLFW_INCLUDE_DIRS}

BinaryMeshFitting/DMCChunk.cpp

@@ -3,6 +3,7 @@
 #include "Tables.hpp"
 #include "NoiseSampler.hpp"
 #include <iostream>
+#include <iomanip>
 #include <queue>
 #include <omp.h>
 #include "MCTable.h"

cmake/Modules/FindFastNoiseSIMD.cmake

@@ -1,5 +1,7 @@
 # Currently very minimal.
 
+include(FindPackageHandleStandardArgs)
+
 find_path(FastNoiseSIMD_INCLUDE_DIR FastNoiseSIMD.h)
 set(FastNoiseSIMD_INCLUDE_DIRS ${FastNoiseSIMD_INCLUDE_DIR})
 

cmake/Modules/FindGLFW.cmake

@@ -1,5 +1,7 @@
 # Currently very minimal.
 
+include(FindPackageHandleStandardArgs)
+
 find_path(GLFW_INCLUDE_DIR GLFW/glfw3.h)
 set(GLFW_INCLUDE_DIRS ${GLFW_INCLUDE_DIR})
 

cmake/Modules/FindGLM.cmake

@@ -1,5 +1,7 @@
 # Currently very minimal.
 
+include(FindPackageHandleStandardArgs)
+
 find_path(GLM_INCLUDE_DIR glm/glm.hpp)
 set(GLM_INCLUDE_DIRS ${GLM_INCLUDE_DIR})