From bc012232375234c5ef92d4afff8f4dc9ec5728e9 Mon Sep 17 00:00:00 2001 From: David Williams Date: Fri, 28 Sep 2012 14:07:13 +0200 Subject: [PATCH] Removed some unecessary hierarchy in VS project structure. Renamed the documentation targets in VS for clarity. --- documentation/CMakeLists.txt | 3 ++- examples/Basic/CMakeLists.txt | 2 +- examples/OpenGL/CMakeLists.txt | 2 +- examples/Paging/CMakeLists.txt | 2 +- examples/SmoothLOD/CMakeLists.txt | 2 +- library/CMakeLists.txt | 4 ++-- library/PolyVoxCore/CMakeLists.txt | 2 +- library/PolyVoxUtil/CMakeLists.txt | 2 +- library/bindings/CMakeLists.txt | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt index dfe05a96..a0d0f346 100644 --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -36,7 +36,8 @@ if(SPHINXBUILD_EXECUTABLE) COMMENT "Building PolyVox manual" ) add_dependencies(manual doc) - SET_PROPERTY(TARGET manual PROPERTY FOLDER "Documentation/Manual") + set_target_properties(manual PROPERTIES PROJECT_LABEL "Manual") #Set label seen in IDE + SET_PROPERTY(TARGET manual PROPERTY FOLDER "Documentation") else() if(NOT SPHINXBUILD_EXECUTABLE) message(STATUS "`sphinx-build` was not found. Try setting SPHINXBUILD_EXECUTABLE to its location.") diff --git a/examples/Basic/CMakeLists.txt b/examples/Basic/CMakeLists.txt index 8c09db66..a17c1eeb 100644 --- a/examples/Basic/CMakeLists.txt +++ b/examples/Basic/CMakeLists.txt @@ -59,7 +59,7 @@ IF(MSVC) SET_TARGET_PROPERTIES(BasicExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") ENDIF(MSVC) TARGET_LINK_LIBRARIES(BasicExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) -SET_PROPERTY(TARGET BasicExample PROPERTY FOLDER "Examples/Basic") +SET_PROPERTY(TARGET BasicExample PROPERTY FOLDER "Examples") #Install - Only install the example in Windows IF(WIN32) diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt index a67c6f88..5b61f759 100644 --- a/examples/OpenGL/CMakeLists.txt +++ b/examples/OpenGL/CMakeLists.txt @@ -65,7 +65,7 @@ IF(MSVC) SET_TARGET_PROPERTIES(OpenGLExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") ENDIF(MSVC) TARGET_LINK_LIBRARIES(OpenGLExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) -SET_PROPERTY(TARGET OpenGLExample PROPERTY FOLDER "Examples/OpenGL") +SET_PROPERTY(TARGET OpenGLExample PROPERTY FOLDER "Examples") #Install - Only install the example in Windows IF(WIN32) diff --git a/examples/Paging/CMakeLists.txt b/examples/Paging/CMakeLists.txt index 2a390919..88fb5b6f 100644 --- a/examples/Paging/CMakeLists.txt +++ b/examples/Paging/CMakeLists.txt @@ -61,7 +61,7 @@ IF(MSVC) SET_TARGET_PROPERTIES(PagingExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") ENDIF(MSVC) TARGET_LINK_LIBRARIES(PagingExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) -SET_PROPERTY(TARGET PagingExample PROPERTY FOLDER "Examples/Paging") +SET_PROPERTY(TARGET PagingExample PROPERTY FOLDER "Examples") #Install - Only install the example in Windows IF(WIN32) diff --git a/examples/SmoothLOD/CMakeLists.txt b/examples/SmoothLOD/CMakeLists.txt index 21da7bc7..86923a0a 100644 --- a/examples/SmoothLOD/CMakeLists.txt +++ b/examples/SmoothLOD/CMakeLists.txt @@ -59,7 +59,7 @@ IF(MSVC) SET_TARGET_PROPERTIES(SmoothLODExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") #All warnings ENDIF(MSVC) TARGET_LINK_LIBRARIES(SmoothLODExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) -SET_PROPERTY(TARGET SmoothLODExample PROPERTY FOLDER "Examples/SmoothLOD") +SET_PROPERTY(TARGET SmoothLODExample PROPERTY FOLDER "Examples") #Install - Only install the example in Windows IF(WIN32) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 617f761d..7c37c32e 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -59,8 +59,8 @@ if(DOXYGEN_FOUND) SOURCES Doxyfile.in polyvox.qhcp.in Mainpage.dox VERBATIM ) - set_target_properties(doc PROPERTIES PROJECT_LABEL "Documentation") #Set label seen in IDE - set_property(TARGET doc PROPERTY FOLDER "Documentation/API Reference") + set_target_properties(doc PROPERTIES PROJECT_LABEL "API Reference") #Set label seen in IDE + set_property(TARGET doc PROPERTY FOLDER "Documentation") #If we found qcollectiongenerator then do more processing if(QT_QCOLLECTIONGENERATOR_EXECUTABLE) diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 4e13cde0..660aa8c8 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -144,7 +144,7 @@ IF(LIBRARY_TYPE STREQUAL "DYNAMIC") ADD_LIBRARY(PolyVoxCore SHARED ${CORE_SRC_FILES} ${CORE_INC_FILES} ${IMPL_SRC_FILES} ${IMPL_INC_FILES}) SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED_EXPORTS") ENDIF() -SET_PROPERTY(TARGET PolyVoxCore PROPERTY FOLDER "Library/PolyVoxCore") +SET_PROPERTY(TARGET PolyVoxCore PROPERTY FOLDER "Library") SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR}) IF(MSVC) diff --git a/library/PolyVoxUtil/CMakeLists.txt b/library/PolyVoxUtil/CMakeLists.txt index bff55765..97dbb8da 100644 --- a/library/PolyVoxUtil/CMakeLists.txt +++ b/library/PolyVoxUtil/CMakeLists.txt @@ -61,7 +61,7 @@ IF(LIBRARY_TYPE STREQUAL "DYNAMIC") ADD_LIBRARY(PolyVoxUtil SHARED ${UTIL_SRC_FILES} ${UTIL_INC_FILES}) SET_TARGET_PROPERTIES(PolyVoxUtil PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED_EXPORTS") ENDIF() -SET_PROPERTY(TARGET PolyVoxUtil PROPERTY FOLDER "Library/PolyVoxUtil") +SET_PROPERTY(TARGET PolyVoxUtil PROPERTY FOLDER "Library") TARGET_LINK_LIBRARIES(PolyVoxUtil PolyVoxCore) SET_TARGET_PROPERTIES(PolyVoxUtil PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR}) diff --git a/library/bindings/CMakeLists.txt b/library/bindings/CMakeLists.txt index a4a29ced..10bcd6f7 100644 --- a/library/bindings/CMakeLists.txt +++ b/library/bindings/CMakeLists.txt @@ -46,7 +46,7 @@ if(ENABLE_BINDINGS) swig_add_module(PolyVoxCore python PolyVoxCore.i) swig_link_libraries(PolyVoxCore ${PYTHON_LIBRARIES} PolyVoxCore) #set_target_properties(${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTIES SUFFIX ".pyd") - SET_PROPERTY(TARGET ${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTY FOLDER "Library/Bindings") + SET_PROPERTY(TARGET ${SWIG_MODULE_PolyVoxCore_REAL_NAME} PROPERTY FOLDER "Bindings") else() set(BUILD_BINDINGS OFF CACHE BOOL "Will the bindings be built" FORCE) endif()