diff --git a/examples/Basic/CMakeLists.txt b/examples/Basic/CMakeLists.txt index 2d89215b..c34dc96c 100644 --- a/examples/Basic/CMakeLists.txt +++ b/examples/Basic/CMakeLists.txt @@ -36,11 +36,6 @@ SET(INC_FILES add_definitions(-DGLEW_STATIC) -#"Sources" and "Headers" are the group names in Visual Studio. -#They may have other uses too... -SOURCE_GROUP("Sources" FILES ${SRC_FILES}) -SOURCE_GROUP("Headers" FILES ${INC_FILES}) - FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) @@ -50,6 +45,9 @@ LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) #This will include the shader files inside the compiled binary QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc) +# Put the resources in a seperate folder in Visual Studio +SOURCE_GROUP("Resource Files" FILES ../common/example.qrc ${COMMON_RESOURCES_RCC}) + #Build ADD_EXECUTABLE(BasicExample ${SRC_FILES} ${COMMON_RESOURCES_RCC}) IF(MSVC) diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt index d6db1712..14e9f4d1 100644 --- a/examples/OpenGL/CMakeLists.txt +++ b/examples/OpenGL/CMakeLists.txt @@ -38,11 +38,6 @@ SET(INC_FILES add_definitions(-DGLEW_STATIC) -#"Sources" and "Headers" are the group names in Visual Studio. -#They may have other uses too... -SOURCE_GROUP("Sources" FILES ${SRC_FILES}) -SOURCE_GROUP("Headers" FILES ${INC_FILES}) - FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) @@ -53,6 +48,9 @@ LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc) QT4_ADD_RESOURCES(OPENGLEXAMPLE_RESOURCES_RCC openglexample.qrc) +# Put the resources in a seperate folder in Visual Studio +SOURCE_GROUP("Resource Files" FILES ../common/example.qrc ${COMMON_RESOURCES_RCC} openglexample.qrc ${OPENGLEXAMPLE_RESOURCES_RCC}) + #Build ADD_EXECUTABLE(OpenGLExample ${SRC_FILES} ${COMMON_RESOURCES_RCC} ${OPENGLEXAMPLE_RESOURCES_RCC}) IF(MSVC) diff --git a/examples/Paging/CMakeLists.txt b/examples/Paging/CMakeLists.txt index 3566e76e..95a3ef8a 100644 --- a/examples/Paging/CMakeLists.txt +++ b/examples/Paging/CMakeLists.txt @@ -38,11 +38,6 @@ SET(INC_FILES add_definitions(-DGLEW_STATIC) -#"Sources" and "Headers" are the group names in Visual Studio. -#They may have other uses too... -SOURCE_GROUP("Sources" FILES ${SRC_FILES}) -SOURCE_GROUP("Headers" FILES ${INC_FILES}) - FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) @@ -52,6 +47,9 @@ LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) #This will include the shader files inside the compiled binary QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc) +# Put the resources in a seperate folder in Visual Studio +SOURCE_GROUP("Resource Files" FILES ../common/example.qrc ${COMMON_RESOURCES_RCC}) + #Build ADD_EXECUTABLE(PagingExample ${SRC_FILES} ${COMMON_RESOURCES_RCC}) IF(MSVC) diff --git a/examples/Python/CMakeLists.txt b/examples/Python/CMakeLists.txt index 1d101d6e..dd7176a7 100644 --- a/examples/Python/CMakeLists.txt +++ b/examples/Python/CMakeLists.txt @@ -21,6 +21,4 @@ PROJECT(PythonExample) -SOURCE_GROUP("Sources" FILES PythonExample.py) - configure_file(PythonExample.py PythonExample.py COPYONLY) diff --git a/examples/SmoothLOD/CMakeLists.txt b/examples/SmoothLOD/CMakeLists.txt index 4a024664..abdc59e5 100644 --- a/examples/SmoothLOD/CMakeLists.txt +++ b/examples/SmoothLOD/CMakeLists.txt @@ -36,11 +36,6 @@ SET(INC_FILES add_definitions(-DGLEW_STATIC) -#"Sources" and "Headers" are the group names in Visual Studio. -#They may have other uses too... -SOURCE_GROUP("Sources" FILES ${SRC_FILES}) -SOURCE_GROUP("Headers" FILES ${INC_FILES}) - FIND_PACKAGE(OpenGL REQUIRED) #Tell CMake the paths for OpenGL and for PolyVox (which is just relative to our current location) @@ -50,6 +45,9 @@ LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}) #This will include the shader files inside the compiled binary QT4_ADD_RESOURCES(COMMON_RESOURCES_RCC ../common/example.qrc) +# Put the resources in a seperate folder in Visual Studio +SOURCE_GROUP("Resource Files" FILES ../common/example.qrc ${COMMON_RESOURCES_RCC}) + #Build ADD_EXECUTABLE(SmoothLODExample ${SRC_FILES} ${COMMON_RESOURCES_RCC}) IF(MSVC) diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 42844fce..3fbb260b 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -130,11 +130,11 @@ SET(IMPL_INC_FILES #"Sources" and "Headers" are the group names in Visual Studio. #They may have other uses too... -SOURCE_GROUP("Sources" FILES ${CORE_SRC_FILES}) -SOURCE_GROUP("Headers" FILES ${CORE_INC_FILES}) +SOURCE_GROUP("Source Files" FILES ${CORE_SRC_FILES}) +SOURCE_GROUP("Header Files" FILES ${CORE_INC_FILES}) -SOURCE_GROUP("Sources\\Impl" FILES ${IMPL_SRC_FILES}) -SOURCE_GROUP("Headers\\Impl" FILES ${IMPL_INC_FILES}) +SOURCE_GROUP("Source Files\\Impl" FILES ${IMPL_SRC_FILES}) +SOURCE_GROUP("Header Files\\Impl" FILES ${IMPL_INC_FILES}) #Tell CMake the paths INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/library/PolyVoxUtil/CMakeLists.txt b/library/PolyVoxUtil/CMakeLists.txt index 7fbdb43e..2160dc5c 100644 --- a/library/PolyVoxUtil/CMakeLists.txt +++ b/library/PolyVoxUtil/CMakeLists.txt @@ -36,8 +36,8 @@ ADD_DEFINITIONS(-DPOLYVOX_SHARED_EXPORTS) #Export symbols in the .dll #"Sources" and "Headers" are the group names in Visual Studio. #They may have other uses too... -SOURCE_GROUP("Sources" FILES ${UTIL_SRC_FILES}) -SOURCE_GROUP("Headers" FILES ${UTIL_INC_FILES}) +SOURCE_GROUP("Source Files" FILES ${UTIL_SRC_FILES}) +SOURCE_GROUP("Header Files" FILES ${UTIL_INC_FILES}) #Tell CMake the paths INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include ${PolyVoxCore_BINARY_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include)