From e65f095fef73ae5553db1643d33529f9d02269ba Mon Sep 17 00:00:00 2001 From: Hai Nguyen Date: Fri, 31 Dec 2021 18:34:14 -0500 Subject: [PATCH 1/4] CMake changes to make source browsing easier in Visual Studio --- CMakeLists.txt | 2 + proj/cmake/configure.cmake | 5 + proj/cmake/libcinder_source_files.cmake | 201 ++++++++++++++++++++++-- proj/cmake/modules/cinderMakeApp.cmake | 7 +- proj/cmake/platform_msw.cmake | 58 ++++++- 5 files changed, 251 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5836d0fc14..eb54a4c3b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,8 @@ endif() # Project start project( cinder ) +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + option( CINDER_BUILD_TESTS "Build unit tests." OFF ) option( CINDER_BUILD_ALL_SAMPLES "Build all samples." OFF ) set( CINDER_BUILD_SAMPLE "" CACHE STRING "Build a specific sample by specifying its path relative to the samples directory (ex. '_opengl/Cube')." ) diff --git a/proj/cmake/configure.cmake b/proj/cmake/configure.cmake index f0c9b99456..8012ea13ee 100644 --- a/proj/cmake/configure.cmake +++ b/proj/cmake/configure.cmake @@ -38,14 +38,19 @@ if( CINDER_TARGET ) string( TOLOWER "${CINDER_TARGET}" CINDER_TARGET_LOWER ) if( "android" STREQUAL "${CINDER_TARGET_LOWER}" ) set( CINDER_ANDROID TRUE ) + set( CINDER_ANDROID ${CINDER_ANDROID} PARENT_SCOPE ) elseif( "ios" STREQUAL "${CINDER_TARGET_LOWER}" ) set( CINDER_COCOA_TOUCH TRUE ) + set( CINDER_COCOA_TOUCH ${CINDER_COCOA_TOUCH} PARENT_SCOPE ) elseif( "linux" STREQUAL "${CINDER_TARGET_LOWER}" ) set( CINDER_LINUX TRUE ) + set( CINDER_LINUX ${CINDER_LINUX} PARENT_SCOPE ) elseif( "macosx" STREQUAL "${CINDER_TARGET_LOWER}" ) set( CINDER_MAC TRUE ) + set( CINDER_MAC ${CINDER_MAC} PARENT_SCOPE ) elseif( "msw" STREQUAL "${CINDER_TARGET_LOWER}" ) set( CINDER_MSW TRUE ) + set( CINDER_MSW ${CINDER_MSW} PARENT_SCOPE ) else() message( FATAL_ERROR "unexpected CINDER_TARGET '${CINDER_TARGET}'." ) endif() diff --git a/proj/cmake/libcinder_source_files.cmake b/proj/cmake/libcinder_source_files.cmake index 4d3bbc5910..3ecc8f8bf9 100644 --- a/proj/cmake/libcinder_source_files.cmake +++ b/proj/cmake/libcinder_source_files.cmake @@ -4,6 +4,66 @@ # cinder # ---------------------------------------------------------------------------------------------------------------------- +list( APPEND HDR_SET_CINDER + ${CINDER_INC_DIR}/cinder/Area.h + ${CINDER_INC_DIR}/cinder/Area.h + ${CINDER_INC_DIR}/cinder/BandedMatrix.h + ${CINDER_INC_DIR}/cinder/Base64.h + ${CINDER_INC_DIR}/cinder/BSpline.h + ${CINDER_INC_DIR}/cinder/BSplineFit.h + ${CINDER_INC_DIR}/cinder/Buffer.h + ${CINDER_INC_DIR}/cinder/Camera.h + ${CINDER_INC_DIR}/cinder/CameraUi.h + ${CINDER_INC_DIR}/cinder/Channel.h + ${CINDER_INC_DIR}/cinder/CinderAssert.h + ${CINDER_INC_DIR}/cinder/CinderMath.h + ${CINDER_INC_DIR}/cinder/Clipboard.h + ${CINDER_INC_DIR}/cinder/Color.h + ${CINDER_INC_DIR}/cinder/DataSource.h + ${CINDER_INC_DIR}/cinder/DataTarget.h + ${CINDER_INC_DIR}/cinder/Display.h + ${CINDER_INC_DIR}/cinder/Exception.h + ${CINDER_INC_DIR}/cinder/Filesystem.h + ${CINDER_INC_DIR}/cinder/FileWatcher.h + ${CINDER_INC_DIR}/cinder/Font.h + ${CINDER_INC_DIR}/cinder/Frustum.h + ${CINDER_INC_DIR}/cinder/GeomIo.h + ${CINDER_INC_DIR}/cinder/ImageFileTinyExr.h + ${CINDER_INC_DIR}/cinder/ImageIo.h + ${CINDER_INC_DIR}/cinder/ImageSourceFileRadiance.h + ${CINDER_INC_DIR}/cinder/ImageSourceFileStbImage.h + ${CINDER_INC_DIR}/cinder/ImageTargetFileStbImage.h + ${CINDER_INC_DIR}/cinder/Json.h + ${CINDER_INC_DIR}/cinder/Log.h + ${CINDER_INC_DIR}/cinder/Matrix.h + ${CINDER_INC_DIR}/cinder/MediaTime.h + ${CINDER_INC_DIR}/cinder/ObjLoader.h + ${CINDER_INC_DIR}/cinder/Path2d.h + ${CINDER_INC_DIR}/cinder/Perlin.h + ${CINDER_INC_DIR}/cinder/Plane.h + ${CINDER_INC_DIR}/cinder/PolyLine.h + ${CINDER_INC_DIR}/cinder/Rand.h + ${CINDER_INC_DIR}/cinder/Ray.h + ${CINDER_INC_DIR}/cinder/Rect.h + ${CINDER_INC_DIR}/cinder/Shape2d.h + ${CINDER_INC_DIR}/cinder/Signals.h + ${CINDER_INC_DIR}/cinder/Sphere.h + ${CINDER_INC_DIR}/cinder/Stream.h + ${CINDER_INC_DIR}/cinder/Surface.h + ${CINDER_INC_DIR}/cinder/System.h + ${CINDER_INC_DIR}/cinder/Text.h + ${CINDER_INC_DIR}/cinder/Timeline.h + ${CINDER_INC_DIR}/cinder/TimelineItem.h + ${CINDER_INC_DIR}/cinder/Timer.h + ${CINDER_INC_DIR}/cinder/Triangulate.h + ${CINDER_INC_DIR}/cinder/TriMesh.h + ${CINDER_INC_DIR}/cinder/Tween.h + ${CINDER_INC_DIR}/cinder/Unicode.h + ${CINDER_INC_DIR}/cinder/Url.h + ${CINDER_INC_DIR}/cinder/Utilities.h + ${CINDER_INC_DIR}/cinder/Xml.h +) + list( APPEND SRC_SET_CINDER ${CINDER_SRC_DIR}/cinder/Area.cpp ${CINDER_SRC_DIR}/cinder/Area.cpp @@ -75,13 +135,24 @@ if( ( NOT CINDER_COCOA_TOUCH ) AND ( NOT CINDER_ANDROID ) ) ) endif() -list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER} ) -source_group( "cinder" FILES ${SRC_SET_CINDER} ) +list( APPEND CINDER_SRC_FILES ${HDR_SET_CINDER} ) +list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER} ) +source_group( "Header Files\\cinder" FILES ${HDR_SET_CINDER} ) +source_group( "Source Files\\cinder" FILES ${SRC_SET_CINDER} ) # ---------------------------------------------------------------------------------------------------------------------- # cinder::app # ---------------------------------------------------------------------------------------------------------------------- +list( APPEND HDR_SET_CINDER_APP + ${CINDER_INC_DIR}/cinder/app/AppBase.h + ${CINDER_INC_DIR}/cinder/app/KeyEvent.h + ${CINDER_INC_DIR}/cinder/app/Platform.h + ${CINDER_INC_DIR}/cinder/app/Renderer.h + ${CINDER_INC_DIR}/cinder/app/RendererGl.h + ${CINDER_INC_DIR}/cinder/app/Window.h +) + list( APPEND SRC_SET_CINDER_APP ${CINDER_SRC_DIR}/cinder/app/AppBase.cpp ${CINDER_SRC_DIR}/cinder/app/KeyEvent.cpp @@ -91,14 +162,40 @@ list( APPEND SRC_SET_CINDER_APP ${CINDER_SRC_DIR}/cinder/app/Window.cpp ) -list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_APP} ) -source_group( "cinder\\app" FILES ${SRC_SET_CINDER_APP} ) +list( APPEND CINDER_SRC_FILES ${HDR_SET_CINDER_APP} ) +list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_APP} ) +source_group( "Header Files\\cinder\\app" FILES ${HDR_SET_CINDER_APP} ) +source_group( "Source Files\\cinder\\app" FILES ${SRC_SET_CINDER_APP} ) # ---------------------------------------------------------------------------------------------------------------------- # cinder::audio # ---------------------------------------------------------------------------------------------------------------------- if( NOT CINDER_DISABLE_AUDIO ) + list( APPEND HDR_SET_CINDER_AUDIO + ${CINDER_INC_DIR}/cinder/audio/ChannelRouterNode.h + ${CINDER_INC_DIR}/cinder/audio/Context.h + ${CINDER_INC_DIR}/cinder/audio/DelayNode.h + ${CINDER_INC_DIR}/cinder/audio/Device.h + ${CINDER_INC_DIR}/cinder/audio/FileOggVorbis.h + ${CINDER_INC_DIR}/cinder/audio/FilterNode.h + ${CINDER_INC_DIR}/cinder/audio/GenNode.h + ${CINDER_INC_DIR}/cinder/audio/InputNode.h + ${CINDER_INC_DIR}/cinder/audio/Node.h + ${CINDER_INC_DIR}/cinder/audio/NodeMath.h + ${CINDER_INC_DIR}/cinder/audio/MonitorNode.h + ${CINDER_INC_DIR}/cinder/audio/OutputNode.h + ${CINDER_INC_DIR}/cinder/audio/PanNode.h + ${CINDER_INC_DIR}/cinder/audio/Param.h + ${CINDER_INC_DIR}/cinder/audio/SamplePlayerNode.h + ${CINDER_INC_DIR}/cinder/audio/SampleRecorderNode.h + ${CINDER_INC_DIR}/cinder/audio/Source.h + ${CINDER_INC_DIR}/cinder/audio/Target.h + ${CINDER_INC_DIR}/cinder/audio/Utilities.h + ${CINDER_INC_DIR}/cinder/audio/Voice.h + ${CINDER_INC_DIR}/cinder/audio/WaveTable.h + ) + list( APPEND SRC_SET_CINDER_AUDIO ${CINDER_SRC_DIR}/cinder/audio/ChannelRouterNode.cpp ${CINDER_SRC_DIR}/cinder/audio/Context.cpp @@ -123,6 +220,13 @@ if( NOT CINDER_DISABLE_AUDIO ) ${CINDER_SRC_DIR}/cinder/audio/WaveTable.cpp ) + list( APPEND HDR_SET_CINDER_AUDIO_DSP + ${CINDER_INC_DIR}/cinder/audio/dsp/Biquad.h + ${CINDER_INC_DIR}/cinder/audio/dsp/Converter.h + ${CINDER_INC_DIR}/cinder/audio/dsp/Dsp.h + ${CINDER_INC_DIR}/cinder/audio/dsp/Fft.h + ) + list( APPEND SRC_SET_CINDER_AUDIO_DSP ${CINDER_SRC_DIR}/cinder/audio/dsp/Biquad.cpp ${CINDER_SRC_DIR}/cinder/audio/dsp/Converter.cpp @@ -130,17 +234,49 @@ if( NOT CINDER_DISABLE_AUDIO ) ${CINDER_SRC_DIR}/cinder/audio/dsp/Fft.cpp ) - list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_AUDIO} ) - source_group( "cinder\\audio" FILES ${SRC_SET_CINDER_AUDIO} ) + list( APPEND CINDER_SRC_FILES ${HDR_SET_CINDER_AUDIO} ) + list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_AUDIO} ) + source_group( "Header Files\\cinder\\audio" FILES ${HDR_SET_CINDER_AUDIO} ) + source_group( "Source Files\\cinder\\audio" FILES ${SRC_SET_CINDER_AUDIO} ) - list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_AUDIO_DSP} ) - source_group( "cinder\\audio\\dsp" FILES ${SRC_SET_CINDER_AUDIO_DSP} ) + list( APPEND CINDER_SRC_FILES ${HDR_SET_CINDER_AUDIO_DSP} ) + list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_AUDIO_DSP} ) + source_group( "Header Files\\cinder\\audio\\dsp" FILES ${HDR_SET_CINDER_AUDIO_DSP} ) + source_group( "Source Files\\cinder\\audio\\dsp" FILES ${SRC_SET_CINDER_AUDIO_DSP} ) endif() # ---------------------------------------------------------------------------------------------------------------------- # cinder::gl # ---------------------------------------------------------------------------------------------------------------------- +list( APPEND HDR_SET_CINDER_GL + ${CINDER_INC_DIR}/cinder/gl/Batch.h + ${CINDER_INC_DIR}/cinder/gl/BufferObj.h + ${CINDER_INC_DIR}/cinder/gl/BufferTexture.h + ${CINDER_INC_DIR}/cinder/gl/ConstantConversions.h + ${CINDER_INC_DIR}/cinder/gl/Context.h + ${CINDER_INC_DIR}/cinder/gl/draw.h + ${CINDER_INC_DIR}/cinder/gl/Environment.h + ${CINDER_INC_DIR}/cinder/gl/Fbo.h + ${CINDER_INC_DIR}/cinder/gl/GlslProg.h + ${CINDER_INC_DIR}/cinder/gl/Pbo.h + ${CINDER_INC_DIR}/cinder/gl/Query.h + ${CINDER_INC_DIR}/cinder/gl/scoped.h + ${CINDER_INC_DIR}/cinder/gl/Sampler.h + ${CINDER_INC_DIR}/cinder/gl/Shader.h + ${CINDER_INC_DIR}/cinder/gl/ShaderPreprocessor.h + ${CINDER_INC_DIR}/cinder/gl/Sync.h + ${CINDER_INC_DIR}/cinder/gl/Texture.h + ${CINDER_INC_DIR}/cinder/gl/TextureFont.h + ${CINDER_INC_DIR}/cinder/gl/TextureFormatParsers.h + ${CINDER_INC_DIR}/cinder/gl/TransformFeedbackObj.h + ${CINDER_INC_DIR}/cinder/gl/Ubo.h + ${CINDER_INC_DIR}/cinder/gl/Vao.h + ${CINDER_INC_DIR}/cinder/gl/Vbo.h + ${CINDER_INC_DIR}/cinder/gl/VboMesh.h + ${CINDER_INC_DIR}/cinder/gl/wrapper.h +) + list( APPEND SRC_SET_CINDER_GL ${CINDER_SRC_DIR}/cinder/gl/Batch.cpp ${CINDER_SRC_DIR}/cinder/gl/BufferObj.cpp @@ -175,13 +311,30 @@ list( APPEND SRC_SET_CINDER_GL ${CINDER_SRC_DIR}/cinder/gl/nv/Multicast.cpp ) -list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_GL} ) -source_group( "cinder\\gl" FILES ${SRC_SET_CINDER_GL} ) +list( APPEND CINDER_SRC_FILES ${HDR_SET_CINDER_GL} ) +list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_GL} ) +source_group( "Header Files\\cinder\\gl" FILES ${HDR_SET_CINDER_GL} ) +source_group( "Source Files\\cinder\\gl" FILES ${SRC_SET_CINDER_GL} ) # ---------------------------------------------------------------------------------------------------------------------- # cinder::ip # ---------------------------------------------------------------------------------------------------------------------- +list( APPEND HDR_SET_CINDER_IP + ${CINDER_INC_DIR}/cinder/ip/Blend.h + ${CINDER_INC_DIR}/cinder/ip/Blur.h + ${CINDER_INC_DIR}/cinder/ip/Checkerboard.h + ${CINDER_INC_DIR}/cinder/ip/Fill.h + ${CINDER_INC_DIR}/cinder/ip/Grayscale.h + ${CINDER_INC_DIR}/cinder/ip/Premultiply.h + ${CINDER_INC_DIR}/cinder/ip/Threshold.h + ${CINDER_INC_DIR}/cinder/ip/EdgeDetect.h + ${CINDER_INC_DIR}/cinder/ip/Flip.h + ${CINDER_INC_DIR}/cinder/ip/Hdr.h + ${CINDER_INC_DIR}/cinder/ip/Resize.h + ${CINDER_INC_DIR}/cinder/ip/Trim.h +) + list( APPEND SRC_SET_CINDER_IP ${CINDER_SRC_DIR}/cinder/ip/Blend.cpp ${CINDER_SRC_DIR}/cinder/ip/Blur.cpp @@ -197,19 +350,27 @@ list( APPEND SRC_SET_CINDER_IP ${CINDER_SRC_DIR}/cinder/ip/Trim.cpp ) -list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_IP} ) -source_group( "cinder\\ip" FILES ${SRC_SET_CINDER_IP} ) +list( APPEND CINDER_SRC_FILES ${HDR_SET_CINDER_IP} ) +list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_IP} ) +source_group( "Header Files\\cinder\\ip" FILES ${HDR_SET_CINDER_IP} ) +source_group( "Source Files\\cinder\\ip" FILES ${SRC_SET_CINDER_IP} ) # ---------------------------------------------------------------------------------------------------------------------- # cinder::svg # ---------------------------------------------------------------------------------------------------------------------- +list( APPEND HDR_SET_CINDER_SVG + ${CINDER_INC_DIR}/cinder/svg/Svg.h +) + list( APPEND SRC_SET_CINDER_SVG ${CINDER_SRC_DIR}/cinder/svg/Svg.cpp ) +list( APPEND CINDER_SRC_FILES ${HDR_SET_CINDER_SVG} ) list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_SVG} ) -source_group( "cinder\\svg" FILES ${SRC_SET_CINDER_SVG} ) +source_group( "Header Files\\cinder\\svg" FILES ${HDR_SET_CINDER_SVG} ) +source_group( "Source Files\\ccinder\\svg" FILES ${SRC_SET_CINDER_SVG} ) # ---------------------------------------------------------------------------------------------------------------------- # tinyexr @@ -297,6 +458,9 @@ endif() # ---------------------------------------------------------------------------------------------------------------------- if( CINDER_ANTTWEAKBAR_ENABLED ) + list( APPEND HDR_SET_CINDER_PARAMS + ${CINDER_INC_DIR}/cinder/params/Params.h + ) list( APPEND SRC_SET_CINDER_PARAMS ${CINDER_SRC_DIR}/cinder/params/Params.cpp @@ -315,16 +479,19 @@ if( CINDER_ANTTWEAKBAR_ENABLED ) ) list( APPEND CINDER_SRC_FILES + ${HDR_SET_CINDER_PARAMS} ${SRC_SET_CINDER_PARAMS} ${SRC_SET_ANTTWEAKBAR} ) - source_group( "cinder\\params" FILES ${SRC_SET_CINDER_PARAMS} ) - source_group( "thirdparty\\AntTweakBar" FILES ${SRC_SET_ANTTWEAKBAR} ) + source_group( "Header Files\\cinder\\params" FILES ${HDR_SET_CINDER_PARAMS} ) + source_group( "Source Files\\cinder\\params" FILES ${SRC_SET_CINDER_PARAMS} ) + source_group( "thirdparty\\AntTweakBar" FILES ${SRC_SET_ANTTWEAKBAR} ) endif() if( CINDER_IMGUI_ENABLED ) + list( APPEND HDR_SET_CINDER_IMGUI ${CINDER_INC_DIR}/cinder/CinderImGui.h ) list( APPEND SRC_SET_CINDER_IMGUI ${CINDER_SRC_DIR}/cinder/CinderImGui.cpp ) list( APPEND SRC_SET_IMGUI ${CINDER_SRC_DIR}/imgui/imgui.cpp @@ -337,10 +504,12 @@ if( CINDER_IMGUI_ENABLED ) ) list( APPEND CINDER_SRC_FILES + ${HDR_SET_CINDER_IMGUI} ${SRC_SET_CINDER_IMGUI} ${SRC_SET_IMGUI} ) - source_group( "cinder" FILES ${SRC_SET_CINDER_IMGUI} ) + source_group( "Header Files\\cinder" FILES ${HDR_SET_CINDER_IMGUI} ) + source_group( "Source Files\\cinder" FILES ${SRC_SET_CINDER_IMGUI} ) source_group( "thirdparty\\imgui" FILES ${SRC_SET_IMGUI} ) endif() diff --git a/proj/cmake/modules/cinderMakeApp.cmake b/proj/cmake/modules/cinderMakeApp.cmake index d03835cf94..5e5152592a 100644 --- a/proj/cmake/modules/cinderMakeApp.cmake +++ b/proj/cmake/modules/cinderMakeApp.cmake @@ -1,7 +1,7 @@ include( CMakeParseArguments ) function( ci_make_app ) - set( oneValueArgs APP_NAME CINDER_PATH ASSETS_PATH ) + set( oneValueArgs APP_NAME CINDER_PATH ASSETS_PATH FOLDER ) set( multiValueArgs SOURCES INCLUDES LIBRARIES RESOURCES BLOCKS ) cmake_parse_arguments( ARG "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) @@ -65,6 +65,7 @@ function( ci_make_app ) ci_log_v( "CINDER_LIB_DIRECTORY: ${CINDER_LIB_DIRECTORY}" ) ci_log_v( "CINDER BLOCKS: ${ARG_BLOCKS}" ) ci_log_v( "ASSETS_PATH: ${ARG_ASSETS_PATH}" ) + ci_log_v( "FOLDER: ${ARG_FOLDER}" ) # This ensures that the application will link with the correct version of Cinder # based on the current build type without the need to remove the entire build folder @@ -139,6 +140,10 @@ function( ci_make_app ) # Ignore Specific Default Libraries for Debug build set_target_properties( ${ARG_APP_NAME} PROPERTIES LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCPMT" ) endif() + + if (ARG_FOLDER) + set_target_properties( ${ARG_APP_NAME} PROPERTIES FOLDER "${ARG_FOLDER}" ) + endif() # Blocks are first searched relative to the sample's CMakeLists.txt file, then within cinder's blocks folder foreach( block ${ARG_BLOCKS} ) diff --git a/proj/cmake/platform_msw.cmake b/proj/cmake/platform_msw.cmake index 36f9f8577e..d97a65c77d 100644 --- a/proj/cmake/platform_msw.cmake +++ b/proj/cmake/platform_msw.cmake @@ -2,6 +2,17 @@ cmake_minimum_required( VERSION 3.10 FATAL_ERROR ) set( CINDER_PLATFORM "MSW" ) +list( APPEND HDR_SET_MSW + ${CINDER_INC_DIR}/cinder/CaptureImplDirectShow.h + ${CINDER_INC_DIR}/cinder/msw/CinderMsw.h + ${CINDER_INC_DIR}/cinder/msw/CinderMswGdiPlus.h + ${CINDER_INC_DIR}/cinder/msw/StackWalker.h + ${CINDER_INC_DIR}/cinder/ImageSourceFileWic.h + ${CINDER_INC_DIR}/cinder/ImageTargetFileWic.h + ${CINDER_INC_DIR}/cinder/UrlImplWinInet.h + ${CINDER_INC_DIR}/glad/glad_wgl.h +) + list( APPEND SRC_SET_MSW ${CINDER_SRC_DIR}/cinder/CaptureImplDirectShow.cpp ${CINDER_SRC_DIR}/videoInput/videoInput.cpp @@ -18,6 +29,22 @@ if( NOT CINDER_DISABLE_ANTTWEAKBAR ) list( APPEND SRC_SET_MSW ${CINDER_SRC_DIR}/AntTweakBar/TwDirect3D11.cpp ) endif() +list( APPEND HDR_SET_APP_MSW + # TODO: should these two files be added to "cinder\\app" group? + ${CINDER_INC_DIR}/cinder/app/AppScreenSaver.h + #${CINDER_INC_DIR}/cinder/app/RendererDx.h + + ${CINDER_INC_DIR}/cinder/app/msw/AppImplMsw.h + ${CINDER_INC_DIR}/cinder/app/msw/AppImplMswBasic.h + ${CINDER_INC_DIR}/cinder/app/msw/AppImplMswScreenSaver.h + ${CINDER_INC_DIR}/cinder/app/msw/AppMsw.h + ${CINDER_INC_DIR}/cinder/app/msw/PlatformMsw.h + ${CINDER_INC_DIR}/cinder/app/msw/RendererImpl2dGdi.h + #${CINDER_INC_DIR}/cinder/app/msw/RendererImplDx.h + #${CINDER_INC_DIR}/cinder/app/msw/RendererImplGlAngle.h + ${CINDER_INC_DIR}/cinder/app/msw/RendererImplGlMsw.h +) + list( APPEND SRC_SET_APP_MSW # TODO: should these two files be added to "cinder\\app" group? ${CINDER_SRC_DIR}/cinder/app/AppScreenSaver.cpp @@ -35,6 +62,13 @@ list( APPEND SRC_SET_APP_MSW ) if( NOT CINDER_DISABLE_AUDIO ) + list( APPEND HDR_SET_AUDIO_MSW + ${CINDER_INC_DIR}/cinder/audio/msw/ContextWasapi.h + ${CINDER_INC_DIR}/cinder/audio/msw/DeviceManagerWasapi.h + ${CINDER_INC_DIR}/cinder/audio/msw/FileMediaFoundation.h + ${CINDER_INC_DIR}/cinder/audio/msw/MswUtil.h + ) + list( APPEND SRC_SET_AUDIO_MSW ${CINDER_SRC_DIR}/cinder/audio/msw/ContextWasapi.cpp ${CINDER_SRC_DIR}/cinder/audio/msw/DeviceManagerWasapi.cpp @@ -42,6 +76,11 @@ if( NOT CINDER_DISABLE_AUDIO ) ${CINDER_SRC_DIR}/cinder/audio/msw/MswUtil.cpp ) + list( APPEND HDR_SET_CINDER_AUDIO_DSP + ${CINDER_INC_DIR}/cinder/audio/dsp/ooura/fftsg.h + ${CINDER_INC_DIR}/cinder/audio/dsp/ConverterR8brain.h + ) + list( APPEND SRC_SET_CINDER_AUDIO_DSP ${CINDER_SRC_DIR}/cinder/audio/dsp/ooura/fftsg.cpp ${CINDER_SRC_DIR}/cinder/audio/dsp/ConverterR8brain.cpp @@ -89,17 +128,26 @@ if( NOT CINDER_DISABLE_VIDEO ) endif() list( APPEND CINDER_SRC_FILES + ${HDR_SET_MSW} + ${HDR_SET_APP_MSW} + ${HDR_SET_AUDIO_MSW} + ${HDR_SET_CINDER_AUDIO_DSP} ${SRC_SET_MSW} ${SRC_SET_APP_MSW} ${SRC_SET_AUDIO_MSW} ${SRC_SET_CINDER_AUDIO_DSP} ) -source_group( "cinder\\msw" FILES ${SRC_SET_MSW} ) -source_group( "cinder\\app\\msw" FILES ${SRC_SET_APP_MSW} ) -source_group( "cinder\\audio\\msw" FILES ${SRC_SET_AUDIO_MSW} ) -source_group( "cinder\\audio\\dsp" FILES ${SRC_SET_CINDER_AUDIO_DSP} ) -source_group( "cinder\\video\\msw" FILES ${SRC_SET_VIDEO_MSW} ) +source_group( "Header Files\\cinder\\msw" FILES ${HDR_SET_MSW} ) +source_group( "Header Files\\cinder\\app\\msw" FILES ${HDR_SET_APP_MSW} ) +source_group( "Header Files\\cinder\\audio\\msw" FILES ${HDR_SET_AUDIO_MSW} ) +source_group( "Header Files\\cinder\\audio\\dsp" FILES ${HDR_SET_CINDER_AUDIO_DSP} ) +source_group( "Header Files\\cinder\\video\\msw" FILES ${HDR_SET_VIDEO_MSW} ) +source_group( "Source Files\\cinder\\msw" FILES ${SRC_SET_MSW} ) +source_group( "Source Files\\cinder\\app\\msw" FILES ${SRC_SET_APP_MSW} ) +source_group( "Source Files\\cinder\\audio\\msw" FILES ${SRC_SET_AUDIO_MSW} ) +source_group( "Source Files\\cinder\\audio\\dsp" FILES ${SRC_SET_CINDER_AUDIO_DSP} ) +source_group( "Source Files\\cinder\\video\\msw" FILES ${SRC_SET_VIDEO_MSW} ) list( APPEND CINDER_INCLUDE_SYSTEM_PRIVATE ${CINDER_INC_DIR}/msw/zlib From 1d50e3892ed6c6692571b8ea8374b36f1d3259f9 Mon Sep 17 00:00:00 2001 From: Hai Nguyen Date: Fri, 31 Dec 2021 19:21:43 -0500 Subject: [PATCH 2/4] Added FOLDER property for samples to add more organization in Visual Studio --- blocks/Box2D/proj/cmake/Box2DConfig.cmake | 2 ++ proj/cmake/libcinder_target.cmake | 3 ++- samples/ArcballDemo/proj/cmake/CMakeLists.txt | 1 + samples/BasicApp/proj/cmake/CMakeLists.txt | 1 + samples/BasicAppMultiWindow/proj/cmake/CMakeLists.txt | 1 + samples/BezierPath/proj/cmake/CMakeLists.txt | 1 + samples/BezierPathIteration/proj/cmake/CMakeLists.txt | 1 + samples/CairoBasic/proj/cmake/CMakeLists.txt | 1 + samples/CameraPersp/proj/cmake/CMakeLists.txt | 1 + samples/CaptureBasic/proj/cmake/CMakeLists.txt | 1 + samples/CaptureCube/proj/cmake/CMakeLists.txt | 1 + samples/ClipboardBasic/proj/cmake/CMakeLists.txt | 1 + samples/Compass/proj/cmake/CMakeLists.txt | 1 + samples/Earthquake/proj/cmake/CMakeLists.txt | 1 + samples/EaseGallery/proj/cmake/CMakeLists.txt | 1 + samples/Extrude/proj/cmake/CMakeLists.txt | 1 + samples/FallingGears/proj/cmake/CMakeLists.txt | 2 ++ samples/FlickrTestMultithreaded/proj/cmake/CMakeLists.txt | 1 + samples/FontSample/proj/cmake/CMakeLists.txt | 1 + samples/FrustumCulling/proj/cmake/CMakeLists.txt | 1 + samples/Geometry/proj/cmake/CMakeLists.txt | 1 + samples/ImageFileBasic/proj/cmake/CMakeLists.txt | 1 + samples/ImageHeightField/proj/cmake/CMakeLists.txt | 1 + samples/Kaleidoscope/proj/cmake/CMakeLists.txt | 1 + samples/LocationManager/proj/cmake/CMakeLists.txt | 1 + samples/Logging/proj/cmake/CMakeLists.txt | 1 + samples/MandelbrotGLSL/proj/cmake/CMakeLists.txt | 1 + samples/MotionBasic/proj/cmake/CMakeLists.txt | 1 + samples/MultiTouchBasic/proj/cmake/CMakeLists.txt | 1 + samples/ParamsBasic/proj/cmake/CMakeLists.txt | 1 + samples/Picking3D/proj/cmake/CMakeLists.txt | 1 + samples/QuaternionAccum/proj/cmake/CMakeLists.txt | 1 + samples/QuickTimeAdvanced/proj/cmake/CMakeLists.txt | 1 + samples/QuickTimeAvfWriter/proj/cmake/CMakeLists.txt | 1 + samples/QuickTimeBasic/proj/cmake/CMakeLists.txt | 1 + samples/QuickTimeIteration/proj/cmake/CMakeLists.txt | 1 + samples/RDiffusion/proj/cmake/CMakeLists.txt | 1 + samples/Renderer2dBasic/proj/cmake/CMakeLists.txt | 1 + samples/SaveImage/proj/cmake/CMakeLists.txt | 1 + samples/SerialCommunication/proj/cmake/CMakeLists.txt | 1 + samples/StereoscopicRendering/proj/cmake/CMakeLists.txt | 1 + samples/SurfaceBasic/proj/cmake/CMakeLists.txt | 1 + samples/TextBox/proj/cmake/CMakeLists.txt | 1 + samples/TextTest/proj/cmake/CMakeLists.txt | 1 + samples/TextureFont/proj/cmake/CMakeLists.txt | 1 + samples/Triangulation/proj/cmake/CMakeLists.txt | 1 + samples/Tubular/proj/cmake/CMakeLists.txt | 1 + samples/VoronoiGpu/proj/cmake/CMakeLists.txt | 1 + samples/Wisteria/proj/cmake/CMakeLists.txt | 1 + samples/_audio/BufferPlayer/proj/cmake/CMakeLists.txt | 1 + samples/_audio/DelayFeedback/proj/cmake/CMakeLists.txt | 1 + samples/_audio/InputAnalyzer/proj/cmake/CMakeLists.txt | 1 + samples/_audio/MultichannelOutput/proj/cmake/CMakeLists.txt | 1 + samples/_audio/NodeAdvanced/proj/cmake/CMakeLists.txt | 1 + samples/_audio/NodeBasic/proj/cmake/CMakeLists.txt | 1 + samples/_audio/NodeSubclassing/proj/cmake/CMakeLists.txt | 1 + samples/_audio/VoiceBasic/proj/cmake/CMakeLists.txt | 1 + samples/_audio/VoiceBasicProcessing/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/ClothSimulation/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/Cube/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/CubeMapping/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/DeferredShading/proj/cmake/CMakeLists.txt | 1 + .../_opengl/DeferredShadingAdvanced/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/DynamicCubeMapping/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/FboBasic/proj/cmake/CMakeLists.txt | 1 + .../_opengl/FboMultipleRenderTargets/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/GeometryShaderBasic/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/HighDynamicRange/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/ImmediateMode/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/InstancedTeapots/proj/cmake/CMakeLists.txt | 1 + .../_opengl/LevelOfDetailIndirect/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/MipMap/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/MotionBlurFbo/proj/cmake/CMakeLists.txt | 1 + .../_opengl/MotionBlurVelocityBuffer/proj/cmake/CMakeLists.txt | 1 + .../_opengl/NVidiaComputeParticles/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/NormalMapping/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/NormalMappingBasic/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/NvidiaMulticast/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/ObjLoader/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/PBOReadBack/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/ParticleSphereCPU/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/ParticleSphereCS/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/ParticleSphereGPU/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/ParticlesBasic/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/PickingFBO/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/PostProcessingAA/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/ShadowMapping/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/ShadowMappingBasic/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/StencilReflection/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/SuperformulaGPU/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/TessellationBasic/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/TessellationBezier/proj/cmake/CMakeLists.txt | 1 + .../TransformFeedbackSmokeParticles/proj/cmake/CMakeLists.txt | 1 + samples/_opengl/VboMesh/proj/cmake/CMakeLists.txt | 1 + samples/_svg/AnimatedReveal/proj/cmake/CMakeLists.txt | 1 + samples/_svg/EuroMap/proj/cmake/CMakeLists.txt | 1 + samples/_svg/GoodNightMorning/proj/cmake/CMakeLists.txt | 1 + samples/_svg/SimpleViewer/proj/cmake/CMakeLists.txt | 1 + samples/_timeline/BasicAppendTween/proj/cmake/CMakeLists.txt | 1 + samples/_timeline/BasicTween/proj/cmake/CMakeLists.txt | 1 + samples/_timeline/CustomCallback/proj/cmake/CMakeLists.txt | 1 + samples/_timeline/CustomLerp/proj/cmake/CMakeLists.txt | 1 + samples/_timeline/DragTween/proj/cmake/CMakeLists.txt | 1 + samples/_timeline/ImageAccordion/proj/cmake/CMakeLists.txt | 1 + samples/_timeline/PaletteBrowser/proj/cmake/CMakeLists.txt | 1 + samples/_timeline/TextInputTween/proj/cmake/CMakeLists.txt | 1 + samples/_timeline/VisualDictionary/proj/cmake/CMakeLists.txt | 1 + samples/perlinTest/proj/cmake/CMakeLists.txt | 1 + samples/slerpBasic/proj/cmake/CMakeLists.txt | 1 + 109 files changed, 112 insertions(+), 1 deletion(-) diff --git a/blocks/Box2D/proj/cmake/Box2DConfig.cmake b/blocks/Box2D/proj/cmake/Box2DConfig.cmake index 9e5e15d8d1..35649aed29 100644 --- a/blocks/Box2D/proj/cmake/Box2DConfig.cmake +++ b/blocks/Box2D/proj/cmake/Box2DConfig.cmake @@ -54,4 +54,6 @@ if( NOT TARGET Box2D ) add_library( Box2D ${BOX2D_SOURCES} ) target_include_directories( Box2D PUBLIC "${BOX2D_SOURCE_PATH}" ) + + set_target_properties( Box2D PROPERTIES FOLDER "cinder/blocks" ) endif() diff --git a/proj/cmake/libcinder_target.cmake b/proj/cmake/libcinder_target.cmake index 66b5b1c932..db09d22119 100755 --- a/proj/cmake/libcinder_target.cmake +++ b/proj/cmake/libcinder_target.cmake @@ -53,7 +53,8 @@ if( CINDER_MSW ) STATIC_LIBRARY_FLAGS_DEBUG "${CINDER_STATIC_LIBS_FLAGS_DEBUG} ${CINDER_STATIC_LIBS_DEPENDS_DEBUG}" STATIC_LIBRARY_FLAGS_RELEASE "${CINDER_STATIC_LIBS_FLAGS_RELEASE} ${CINDER_STATIC_LIBS_DEPENDS_RELEASE}" STATIC_LIBRARY_FLAGS_MINSIZEREL "${CINDER_STATIC_LIBS_FLAGS_RELEASE} ${CINDER_STATIC_LIBS_DEPENDS_RELEASE}" - STATIC_LIBRARY_FLAGS_RELWITHDEBINFO "${CINDER_STATIC_LIBS_FLAGS_RELEASE} ${CINDER_STATIC_LIBS_DEPENDS_RELEASE}" + STATIC_LIBRARY_FLAGS_RELWITHDEBINFO "${CINDER_STATIC_LIBS_FLAGS_RELEASE} ${CINDER_STATIC_LIBS_DEPENDS_RELEASE}" + FOLDER "cinder" ) elseif( CINDER_MAC ) set( OUTPUT_DIRECTORY_BASE "${CINDER_PATH}/lib/${CINDER_TARGET_SUBFOLDER}" ) diff --git a/samples/ArcballDemo/proj/cmake/CMakeLists.txt b/samples/ArcballDemo/proj/cmake/CMakeLists.txt index f6109450e5..e74230d604 100644 --- a/samples/ArcballDemo/proj/cmake/CMakeLists.txt +++ b/samples/ArcballDemo/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( SOURCES ${APP_PATH}/src/ArcballDemoApp.cpp CINDER_PATH ${CINDER_PATH} INCLUDES ${APP_PATH}/include + FOLDER "cinder/samples" ) diff --git a/samples/BasicApp/proj/cmake/CMakeLists.txt b/samples/BasicApp/proj/cmake/CMakeLists.txt index 4b61aa0084..355d483835 100644 --- a/samples/BasicApp/proj/cmake/CMakeLists.txt +++ b/samples/BasicApp/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/BasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/BasicAppMultiWindow/proj/cmake/CMakeLists.txt b/samples/BasicAppMultiWindow/proj/cmake/CMakeLists.txt index ca725ac40f..7524ceb40f 100644 --- a/samples/BasicAppMultiWindow/proj/cmake/CMakeLists.txt +++ b/samples/BasicAppMultiWindow/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/BasicAppMultiWindowApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/BezierPath/proj/cmake/CMakeLists.txt b/samples/BezierPath/proj/cmake/CMakeLists.txt index 915e1b9129..79ddc3497b 100644 --- a/samples/BezierPath/proj/cmake/CMakeLists.txt +++ b/samples/BezierPath/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/BezierPathApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/BezierPathIteration/proj/cmake/CMakeLists.txt b/samples/BezierPathIteration/proj/cmake/CMakeLists.txt index 66dd2d66d6..968696ca75 100644 --- a/samples/BezierPathIteration/proj/cmake/CMakeLists.txt +++ b/samples/BezierPathIteration/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/BezierPathIterationApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/CairoBasic/proj/cmake/CMakeLists.txt b/samples/CairoBasic/proj/cmake/CMakeLists.txt index 05a2d20e92..12f78c03f6 100644 --- a/samples/CairoBasic/proj/cmake/CMakeLists.txt +++ b/samples/CairoBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/CairoBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/CameraPersp/proj/cmake/CMakeLists.txt b/samples/CameraPersp/proj/cmake/CMakeLists.txt index 3215fc5802..8c9b37b38e 100644 --- a/samples/CameraPersp/proj/cmake/CMakeLists.txt +++ b/samples/CameraPersp/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( SOURCES ${APP_PATH}/src/CameraPerspApp.cpp INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/CaptureBasic/proj/cmake/CMakeLists.txt b/samples/CaptureBasic/proj/cmake/CMakeLists.txt index 592c636e49..d1cdf3285e 100644 --- a/samples/CaptureBasic/proj/cmake/CMakeLists.txt +++ b/samples/CaptureBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/CaptureBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/CaptureCube/proj/cmake/CMakeLists.txt b/samples/CaptureCube/proj/cmake/CMakeLists.txt index d0715e0a98..cb9d8ab89f 100644 --- a/samples/CaptureCube/proj/cmake/CMakeLists.txt +++ b/samples/CaptureCube/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/CaptureCubeApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/ClipboardBasic/proj/cmake/CMakeLists.txt b/samples/ClipboardBasic/proj/cmake/CMakeLists.txt index 0ff73391f5..fbb9520f43 100644 --- a/samples/ClipboardBasic/proj/cmake/CMakeLists.txt +++ b/samples/ClipboardBasic/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( SOURCES ${APP_PATH}/src/ClipboardBasicApp.cpp CINDER_PATH ${CINDER_PATH} INCLUDES ${APP_PATH}/include + FOLDER "cinder/samples" ) diff --git a/samples/Compass/proj/cmake/CMakeLists.txt b/samples/Compass/proj/cmake/CMakeLists.txt index 8bb262f7b7..e8d66afe92 100644 --- a/samples/Compass/proj/cmake/CMakeLists.txt +++ b/samples/Compass/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/CompassApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/Earthquake/proj/cmake/CMakeLists.txt b/samples/Earthquake/proj/cmake/CMakeLists.txt index 77414a4f86..f93c58279e 100644 --- a/samples/Earthquake/proj/cmake/CMakeLists.txt +++ b/samples/Earthquake/proj/cmake/CMakeLists.txt @@ -32,4 +32,5 @@ ci_make_app( CINDER_PATH ${CINDER_PATH} INCLUDES ${APP_PATH}/include RESOURCES ${RESOURCE_FILES} + FOLDER "cinder/samples" ) diff --git a/samples/EaseGallery/proj/cmake/CMakeLists.txt b/samples/EaseGallery/proj/cmake/CMakeLists.txt index f22a9f3549..6dfad1cf4c 100644 --- a/samples/EaseGallery/proj/cmake/CMakeLists.txt +++ b/samples/EaseGallery/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/EaseGalleryApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/Extrude/proj/cmake/CMakeLists.txt b/samples/Extrude/proj/cmake/CMakeLists.txt index 19bbe02f76..93576f6ae0 100644 --- a/samples/Extrude/proj/cmake/CMakeLists.txt +++ b/samples/Extrude/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ExtrudeApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/FallingGears/proj/cmake/CMakeLists.txt b/samples/FallingGears/proj/cmake/CMakeLists.txt index 4d8a7ee6c2..4ce64f5ec0 100644 --- a/samples/FallingGears/proj/cmake/CMakeLists.txt +++ b/samples/FallingGears/proj/cmake/CMakeLists.txt @@ -19,7 +19,9 @@ set( SRC_FILES ) ci_make_app( + APP_NAME "FallingGears" SOURCES ${SRC_FILES} CINDER_PATH ${CINDER_PATH} BLOCKS Box2D + FOLDER "cinder/samples" ) diff --git a/samples/FlickrTestMultithreaded/proj/cmake/CMakeLists.txt b/samples/FlickrTestMultithreaded/proj/cmake/CMakeLists.txt index d2bd1ff2a2..fac5a4a40e 100644 --- a/samples/FlickrTestMultithreaded/proj/cmake/CMakeLists.txt +++ b/samples/FlickrTestMultithreaded/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/FlickrTestMultithreadedApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/FontSample/proj/cmake/CMakeLists.txt b/samples/FontSample/proj/cmake/CMakeLists.txt index b7d09e7ec5..729bbf021c 100644 --- a/samples/FontSample/proj/cmake/CMakeLists.txt +++ b/samples/FontSample/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/FontSampleApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/FrustumCulling/proj/cmake/CMakeLists.txt b/samples/FrustumCulling/proj/cmake/CMakeLists.txt index d562bdd544..2bc07cf082 100644 --- a/samples/FrustumCulling/proj/cmake/CMakeLists.txt +++ b/samples/FrustumCulling/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( SOURCES ${APP_PATH}/src/FrustumCullingApp.cpp ${APP_PATH}/src/CullableObject.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/Geometry/proj/cmake/CMakeLists.txt b/samples/Geometry/proj/cmake/CMakeLists.txt index 56ca20fd82..a6d742a237 100644 --- a/samples/Geometry/proj/cmake/CMakeLists.txt +++ b/samples/Geometry/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/GeometryApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/ImageFileBasic/proj/cmake/CMakeLists.txt b/samples/ImageFileBasic/proj/cmake/CMakeLists.txt index a0ab8796ba..1c1536d350 100644 --- a/samples/ImageFileBasic/proj/cmake/CMakeLists.txt +++ b/samples/ImageFileBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ImageFileBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/ImageHeightField/proj/cmake/CMakeLists.txt b/samples/ImageHeightField/proj/cmake/CMakeLists.txt index 56901b9f58..1db51ee31c 100644 --- a/samples/ImageHeightField/proj/cmake/CMakeLists.txt +++ b/samples/ImageHeightField/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ImageHeightFieldApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/Kaleidoscope/proj/cmake/CMakeLists.txt b/samples/Kaleidoscope/proj/cmake/CMakeLists.txt index c555b842fd..06affc3389 100644 --- a/samples/Kaleidoscope/proj/cmake/CMakeLists.txt +++ b/samples/Kaleidoscope/proj/cmake/CMakeLists.txt @@ -15,4 +15,5 @@ ci_make_app( ${APP_PATH}/src/TrianglePiece.cpp INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/LocationManager/proj/cmake/CMakeLists.txt b/samples/LocationManager/proj/cmake/CMakeLists.txt index e691713d8f..2f8ea12673 100644 --- a/samples/LocationManager/proj/cmake/CMakeLists.txt +++ b/samples/LocationManager/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/LocationManagerApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/Logging/proj/cmake/CMakeLists.txt b/samples/Logging/proj/cmake/CMakeLists.txt index 0ba9b8fa7d..e87f058c72 100644 --- a/samples/Logging/proj/cmake/CMakeLists.txt +++ b/samples/Logging/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/LoggingApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/MandelbrotGLSL/proj/cmake/CMakeLists.txt b/samples/MandelbrotGLSL/proj/cmake/CMakeLists.txt index 0b09705a32..7da4cd00a7 100644 --- a/samples/MandelbrotGLSL/proj/cmake/CMakeLists.txt +++ b/samples/MandelbrotGLSL/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( SOURCES ${APP_PATH}/src/MandelbrotGLSLApp.cpp INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/MotionBasic/proj/cmake/CMakeLists.txt b/samples/MotionBasic/proj/cmake/CMakeLists.txt index a91fe6ffd5..842d6da5a7 100644 --- a/samples/MotionBasic/proj/cmake/CMakeLists.txt +++ b/samples/MotionBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/MotionBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/MultiTouchBasic/proj/cmake/CMakeLists.txt b/samples/MultiTouchBasic/proj/cmake/CMakeLists.txt index 6bb5e9ae86..fc1626e0b5 100644 --- a/samples/MultiTouchBasic/proj/cmake/CMakeLists.txt +++ b/samples/MultiTouchBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/MultiTouchBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/ParamsBasic/proj/cmake/CMakeLists.txt b/samples/ParamsBasic/proj/cmake/CMakeLists.txt index 167fa9bc80..e26fb30240 100644 --- a/samples/ParamsBasic/proj/cmake/CMakeLists.txt +++ b/samples/ParamsBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ParamsBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/Picking3D/proj/cmake/CMakeLists.txt b/samples/Picking3D/proj/cmake/CMakeLists.txt index d24121b301..3fefde5a46 100644 --- a/samples/Picking3D/proj/cmake/CMakeLists.txt +++ b/samples/Picking3D/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/Picking3DApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/QuaternionAccum/proj/cmake/CMakeLists.txt b/samples/QuaternionAccum/proj/cmake/CMakeLists.txt index c3fe1567d3..2694e901f2 100644 --- a/samples/QuaternionAccum/proj/cmake/CMakeLists.txt +++ b/samples/QuaternionAccum/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( SOURCES ${APP_PATH}/src/QuaternionAccumApp.cpp INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/QuickTimeAdvanced/proj/cmake/CMakeLists.txt b/samples/QuickTimeAdvanced/proj/cmake/CMakeLists.txt index 591624bf68..414b901e98 100644 --- a/samples/QuickTimeAdvanced/proj/cmake/CMakeLists.txt +++ b/samples/QuickTimeAdvanced/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/QTimeAdvApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/QuickTimeAvfWriter/proj/cmake/CMakeLists.txt b/samples/QuickTimeAvfWriter/proj/cmake/CMakeLists.txt index 4c30804568..2865a53215 100644 --- a/samples/QuickTimeAvfWriter/proj/cmake/CMakeLists.txt +++ b/samples/QuickTimeAvfWriter/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/MovieWriterApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/QuickTimeBasic/proj/cmake/CMakeLists.txt b/samples/QuickTimeBasic/proj/cmake/CMakeLists.txt index ec3186b61c..e399941949 100644 --- a/samples/QuickTimeBasic/proj/cmake/CMakeLists.txt +++ b/samples/QuickTimeBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/QuickTimeBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/QuickTimeIteration/proj/cmake/CMakeLists.txt b/samples/QuickTimeIteration/proj/cmake/CMakeLists.txt index 2df8520a53..98691341ad 100644 --- a/samples/QuickTimeIteration/proj/cmake/CMakeLists.txt +++ b/samples/QuickTimeIteration/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/QuickTimeIterationApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/RDiffusion/proj/cmake/CMakeLists.txt b/samples/RDiffusion/proj/cmake/CMakeLists.txt index 3c017bdfa3..6b5deeae04 100644 --- a/samples/RDiffusion/proj/cmake/CMakeLists.txt +++ b/samples/RDiffusion/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( SOURCES ${APP_PATH}/src/RDiffusionApp.cpp INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/Renderer2dBasic/proj/cmake/CMakeLists.txt b/samples/Renderer2dBasic/proj/cmake/CMakeLists.txt index 3dbce94bd8..df62b7cfc7 100644 --- a/samples/Renderer2dBasic/proj/cmake/CMakeLists.txt +++ b/samples/Renderer2dBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/Renderer2dApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/SaveImage/proj/cmake/CMakeLists.txt b/samples/SaveImage/proj/cmake/CMakeLists.txt index eddd875de7..8a2356d6db 100644 --- a/samples/SaveImage/proj/cmake/CMakeLists.txt +++ b/samples/SaveImage/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/SaveImageApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/SerialCommunication/proj/cmake/CMakeLists.txt b/samples/SerialCommunication/proj/cmake/CMakeLists.txt index 46b564d100..daa51d9d90 100644 --- a/samples/SerialCommunication/proj/cmake/CMakeLists.txt +++ b/samples/SerialCommunication/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/SerialCommunicationApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/StereoscopicRendering/proj/cmake/CMakeLists.txt b/samples/StereoscopicRendering/proj/cmake/CMakeLists.txt index 8f0eab1477..e5e922f758 100644 --- a/samples/StereoscopicRendering/proj/cmake/CMakeLists.txt +++ b/samples/StereoscopicRendering/proj/cmake/CMakeLists.txt @@ -13,4 +13,5 @@ ci_make_app( ${APP_PATH}/src/StereoAutoFocuser.cpp INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/SurfaceBasic/proj/cmake/CMakeLists.txt b/samples/SurfaceBasic/proj/cmake/CMakeLists.txt index 6c2e8fbbd5..4ee15bb073 100644 --- a/samples/SurfaceBasic/proj/cmake/CMakeLists.txt +++ b/samples/SurfaceBasic/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( SOURCES ${APP_PATH}/src/SurfaceBasicApp.cpp INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/TextBox/proj/cmake/CMakeLists.txt b/samples/TextBox/proj/cmake/CMakeLists.txt index 77dc8f796a..9b832d66cb 100644 --- a/samples/TextBox/proj/cmake/CMakeLists.txt +++ b/samples/TextBox/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/TextBoxApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/TextTest/proj/cmake/CMakeLists.txt b/samples/TextTest/proj/cmake/CMakeLists.txt index c7e9462859..94f06825c2 100644 --- a/samples/TextTest/proj/cmake/CMakeLists.txt +++ b/samples/TextTest/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( SOURCES ${APP_PATH}/src/TextTestApp.cpp INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/TextureFont/proj/cmake/CMakeLists.txt b/samples/TextureFont/proj/cmake/CMakeLists.txt index ec3222a9a4..16c57833f4 100644 --- a/samples/TextureFont/proj/cmake/CMakeLists.txt +++ b/samples/TextureFont/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/TextureFontApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/Triangulation/proj/cmake/CMakeLists.txt b/samples/Triangulation/proj/cmake/CMakeLists.txt index 0ad23f9e4e..8c772b6933 100644 --- a/samples/Triangulation/proj/cmake/CMakeLists.txt +++ b/samples/Triangulation/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/TriangulationApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/Tubular/proj/cmake/CMakeLists.txt b/samples/Tubular/proj/cmake/CMakeLists.txt index d3e144c49c..a518530e58 100644 --- a/samples/Tubular/proj/cmake/CMakeLists.txt +++ b/samples/Tubular/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( SOURCES ${APP_PATH}/src/TubularApp.cpp ${APP_PATH}/src/Tube.cpp INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/VoronoiGpu/proj/cmake/CMakeLists.txt b/samples/VoronoiGpu/proj/cmake/CMakeLists.txt index 3bec8f2dc3..0e11a27174 100644 --- a/samples/VoronoiGpu/proj/cmake/CMakeLists.txt +++ b/samples/VoronoiGpu/proj/cmake/CMakeLists.txt @@ -13,4 +13,5 @@ ci_make_app( ${APP_PATH}/src/VoronoiGpu.cpp INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/Wisteria/proj/cmake/CMakeLists.txt b/samples/Wisteria/proj/cmake/CMakeLists.txt index 277a65cddd..7ef7e3e2f1 100644 --- a/samples/Wisteria/proj/cmake/CMakeLists.txt +++ b/samples/Wisteria/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/WisteriaApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/_audio/BufferPlayer/proj/cmake/CMakeLists.txt b/samples/_audio/BufferPlayer/proj/cmake/CMakeLists.txt index 1e1fdda64a..fa7e876b68 100644 --- a/samples/_audio/BufferPlayer/proj/cmake/CMakeLists.txt +++ b/samples/_audio/BufferPlayer/proj/cmake/CMakeLists.txt @@ -19,4 +19,5 @@ ci_make_app( SOURCES ${SRC_FILES} INCLUDES ${APP_PATH}/include RESOURCES ${APP_PATH}/../../data/sound/DrainMagic.ogg + FOLDER "cinder/samples/_audio" ) diff --git a/samples/_audio/DelayFeedback/proj/cmake/CMakeLists.txt b/samples/_audio/DelayFeedback/proj/cmake/CMakeLists.txt index d7eec3dce3..16fb4148a3 100644 --- a/samples/_audio/DelayFeedback/proj/cmake/CMakeLists.txt +++ b/samples/_audio/DelayFeedback/proj/cmake/CMakeLists.txt @@ -18,4 +18,5 @@ ci_make_app( CINDER_PATH ${CINDER_PATH} INCLUDES ${APP_PATH}/include RESOURCES ${RESOURCE_FILES} + FOLDER "cinder/samples/_audio" ) diff --git a/samples/_audio/InputAnalyzer/proj/cmake/CMakeLists.txt b/samples/_audio/InputAnalyzer/proj/cmake/CMakeLists.txt index c93fabf640..55c9ca5404 100644 --- a/samples/_audio/InputAnalyzer/proj/cmake/CMakeLists.txt +++ b/samples/_audio/InputAnalyzer/proj/cmake/CMakeLists.txt @@ -16,4 +16,5 @@ set( SRC_FILES ci_make_app( SOURCES ${SRC_FILES} CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_audio" ) diff --git a/samples/_audio/MultichannelOutput/proj/cmake/CMakeLists.txt b/samples/_audio/MultichannelOutput/proj/cmake/CMakeLists.txt index a453dee755..e94eaf28a0 100644 --- a/samples/_audio/MultichannelOutput/proj/cmake/CMakeLists.txt +++ b/samples/_audio/MultichannelOutput/proj/cmake/CMakeLists.txt @@ -16,4 +16,5 @@ set( SRC_FILES ci_make_app( SOURCES ${SRC_FILES} CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_audio" ) diff --git a/samples/_audio/NodeAdvanced/proj/cmake/CMakeLists.txt b/samples/_audio/NodeAdvanced/proj/cmake/CMakeLists.txt index 49feaa08e8..4c4f873150 100644 --- a/samples/_audio/NodeAdvanced/proj/cmake/CMakeLists.txt +++ b/samples/_audio/NodeAdvanced/proj/cmake/CMakeLists.txt @@ -16,4 +16,5 @@ set( SRC_FILES ci_make_app( SOURCES ${SRC_FILES} CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_audio" ) diff --git a/samples/_audio/NodeBasic/proj/cmake/CMakeLists.txt b/samples/_audio/NodeBasic/proj/cmake/CMakeLists.txt index 140d0ea08d..ba73f6f90b 100644 --- a/samples/_audio/NodeBasic/proj/cmake/CMakeLists.txt +++ b/samples/_audio/NodeBasic/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( APP_NAME "NodeBasic" SOURCES ${APP_PATH}/src/NodeBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_audio" ) diff --git a/samples/_audio/NodeSubclassing/proj/cmake/CMakeLists.txt b/samples/_audio/NodeSubclassing/proj/cmake/CMakeLists.txt index b169a39862..b2cb658b17 100644 --- a/samples/_audio/NodeSubclassing/proj/cmake/CMakeLists.txt +++ b/samples/_audio/NodeSubclassing/proj/cmake/CMakeLists.txt @@ -17,4 +17,5 @@ set( SRC_FILES ci_make_app( SOURCES ${SRC_FILES} CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_audio" ) diff --git a/samples/_audio/VoiceBasic/proj/cmake/CMakeLists.txt b/samples/_audio/VoiceBasic/proj/cmake/CMakeLists.txt index 7554839966..c8370160d1 100644 --- a/samples/_audio/VoiceBasic/proj/cmake/CMakeLists.txt +++ b/samples/_audio/VoiceBasic/proj/cmake/CMakeLists.txt @@ -13,4 +13,5 @@ ci_make_app( CINDER_PATH ${CINDER_PATH} INCLUDES ${APP_PATH}/include RESOURCES ${APP_PATH}/../../data/sound/DrainMagic.ogg + FOLDER "cinder/samples/_audio" ) diff --git a/samples/_audio/VoiceBasicProcessing/proj/cmake/CMakeLists.txt b/samples/_audio/VoiceBasicProcessing/proj/cmake/CMakeLists.txt index cc3c4403ec..b2c17e1c61 100644 --- a/samples/_audio/VoiceBasicProcessing/proj/cmake/CMakeLists.txt +++ b/samples/_audio/VoiceBasicProcessing/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/VoiceBasicProcessingApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_audio" ) diff --git a/samples/_opengl/ClothSimulation/proj/cmake/CMakeLists.txt b/samples/_opengl/ClothSimulation/proj/cmake/CMakeLists.txt index 9c53b27b65..e5d97359e2 100644 --- a/samples/_opengl/ClothSimulation/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/ClothSimulation/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ClothSimulationApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/Cube/proj/cmake/CMakeLists.txt b/samples/_opengl/Cube/proj/cmake/CMakeLists.txt index 8389d217b2..b235ea91e2 100644 --- a/samples/_opengl/Cube/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/Cube/proj/cmake/CMakeLists.txt @@ -12,4 +12,5 @@ ci_make_app( APP_NAME "Cube" SOURCES ${APP_PATH}/src/CubeApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/CubeMapping/proj/cmake/CMakeLists.txt b/samples/_opengl/CubeMapping/proj/cmake/CMakeLists.txt index 1698044258..378c17da83 100644 --- a/samples/_opengl/CubeMapping/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/CubeMapping/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/CubeMappingApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/DeferredShading/proj/cmake/CMakeLists.txt b/samples/_opengl/DeferredShading/proj/cmake/CMakeLists.txt index a7ad2549b0..e9e4fa07af 100644 --- a/samples/_opengl/DeferredShading/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/DeferredShading/proj/cmake/CMakeLists.txt @@ -17,4 +17,5 @@ ci_make_app( SOURCES ${SRC_FILES} CINDER_PATH ${CINDER_PATH} INCLUDES ${APP_PATH}/include + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/DeferredShadingAdvanced/proj/cmake/CMakeLists.txt b/samples/_opengl/DeferredShadingAdvanced/proj/cmake/CMakeLists.txt index 8e2f91cbee..4cb86f713a 100644 --- a/samples/_opengl/DeferredShadingAdvanced/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/DeferredShadingAdvanced/proj/cmake/CMakeLists.txt @@ -19,4 +19,5 @@ ci_make_app( SOURCES ${SRC_FILES} CINDER_PATH ${CINDER_PATH} INCLUDES ${APP_PATH}/include + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/DynamicCubeMapping/proj/cmake/CMakeLists.txt b/samples/_opengl/DynamicCubeMapping/proj/cmake/CMakeLists.txt index e3017c3c98..5aa9058b4f 100644 --- a/samples/_opengl/DynamicCubeMapping/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/DynamicCubeMapping/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/DynamicCubeMappingApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/FboBasic/proj/cmake/CMakeLists.txt b/samples/_opengl/FboBasic/proj/cmake/CMakeLists.txt index 19892a1697..1f49222504 100644 --- a/samples/_opengl/FboBasic/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/FboBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/FboBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/FboMultipleRenderTargets/proj/cmake/CMakeLists.txt b/samples/_opengl/FboMultipleRenderTargets/proj/cmake/CMakeLists.txt index a9b2b470fc..90b550f4c0 100644 --- a/samples/_opengl/FboMultipleRenderTargets/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/FboMultipleRenderTargets/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/FboMultipleRenderTargetsApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/GeometryShaderBasic/proj/cmake/CMakeLists.txt b/samples/_opengl/GeometryShaderBasic/proj/cmake/CMakeLists.txt index b8249e673e..bc795e36f2 100644 --- a/samples/_opengl/GeometryShaderBasic/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/GeometryShaderBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/GeometryShaderBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/HighDynamicRange/proj/cmake/CMakeLists.txt b/samples/_opengl/HighDynamicRange/proj/cmake/CMakeLists.txt index 270bdf2a69..e59958fb2c 100644 --- a/samples/_opengl/HighDynamicRange/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/HighDynamicRange/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/HighDynamicRangeApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/ImmediateMode/proj/cmake/CMakeLists.txt b/samples/_opengl/ImmediateMode/proj/cmake/CMakeLists.txt index 0c74465151..4f74620854 100644 --- a/samples/_opengl/ImmediateMode/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/ImmediateMode/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ImmediateModeApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/InstancedTeapots/proj/cmake/CMakeLists.txt b/samples/_opengl/InstancedTeapots/proj/cmake/CMakeLists.txt index bab9087188..c64163c927 100644 --- a/samples/_opengl/InstancedTeapots/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/InstancedTeapots/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/InstancedTeapotsApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/LevelOfDetailIndirect/proj/cmake/CMakeLists.txt b/samples/_opengl/LevelOfDetailIndirect/proj/cmake/CMakeLists.txt index b324298942..c6a5175f97 100644 --- a/samples/_opengl/LevelOfDetailIndirect/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/LevelOfDetailIndirect/proj/cmake/CMakeLists.txt @@ -16,4 +16,5 @@ ci_make_app( SOURCES ${SRC_FILES} CINDER_PATH ${CINDER_PATH} INCLUDES ${SAMPLE_DIR}/include + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/MipMap/proj/cmake/CMakeLists.txt b/samples/_opengl/MipMap/proj/cmake/CMakeLists.txt index 123fb66b90..ee83e1c64a 100644 --- a/samples/_opengl/MipMap/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/MipMap/proj/cmake/CMakeLists.txt @@ -27,4 +27,5 @@ ci_make_app( CINDER_PATH ${CINDER_PATH} INCLUDES ${APP_PATH}/include RESOURCES ${RESOURCE_FILES} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/MotionBlurFbo/proj/cmake/CMakeLists.txt b/samples/_opengl/MotionBlurFbo/proj/cmake/CMakeLists.txt index b07dda0931..c904c5ca28 100644 --- a/samples/_opengl/MotionBlurFbo/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/MotionBlurFbo/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/MotionBlurFboApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/MotionBlurVelocityBuffer/proj/cmake/CMakeLists.txt b/samples/_opengl/MotionBlurVelocityBuffer/proj/cmake/CMakeLists.txt index 469213a936..8a5c33ca3f 100644 --- a/samples/_opengl/MotionBlurVelocityBuffer/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/MotionBlurVelocityBuffer/proj/cmake/CMakeLists.txt @@ -16,4 +16,5 @@ set( SRC_FILES ci_make_app( SOURCES ${SRC_FILES} CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/NVidiaComputeParticles/proj/cmake/CMakeLists.txt b/samples/_opengl/NVidiaComputeParticles/proj/cmake/CMakeLists.txt index 660b66b9f9..3736f9e1d0 100644 --- a/samples/_opengl/NVidiaComputeParticles/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/NVidiaComputeParticles/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/NVidiaComputeParticlesApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/NormalMapping/proj/cmake/CMakeLists.txt b/samples/_opengl/NormalMapping/proj/cmake/CMakeLists.txt index f21f68b41d..6840b6e33a 100644 --- a/samples/_opengl/NormalMapping/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/NormalMapping/proj/cmake/CMakeLists.txt @@ -18,4 +18,5 @@ ci_make_app( SOURCES ${SRC_FILES} CINDER_PATH ${CINDER_PATH} INCLUDES ${APP_PATH}/include + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/NormalMappingBasic/proj/cmake/CMakeLists.txt b/samples/_opengl/NormalMappingBasic/proj/cmake/CMakeLists.txt index d5a74b5ccd..54be59c798 100644 --- a/samples/_opengl/NormalMappingBasic/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/NormalMappingBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/NormalMappingBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/NvidiaMulticast/proj/cmake/CMakeLists.txt b/samples/_opengl/NvidiaMulticast/proj/cmake/CMakeLists.txt index 2fb52c018e..594ea3ab9f 100644 --- a/samples/_opengl/NvidiaMulticast/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/NvidiaMulticast/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/NvidiaMulticastApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/ObjLoader/proj/cmake/CMakeLists.txt b/samples/_opengl/ObjLoader/proj/cmake/CMakeLists.txt index 7395cf286b..c7729c9480 100644 --- a/samples/_opengl/ObjLoader/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/ObjLoader/proj/cmake/CMakeLists.txt @@ -14,4 +14,5 @@ ci_make_app( SOURCES ${APP_PATH}/src/ObjLoaderApp.cpp INCLUDES ${APP_PATH}/include RESOURCES ${APP_PATH}/../../data/models/8lbs.obj + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/PBOReadBack/proj/cmake/CMakeLists.txt b/samples/_opengl/PBOReadBack/proj/cmake/CMakeLists.txt index 20ed9604b2..dcc05ce7e8 100644 --- a/samples/_opengl/PBOReadBack/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/PBOReadBack/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/PBOReadBackApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/ParticleSphereCPU/proj/cmake/CMakeLists.txt b/samples/_opengl/ParticleSphereCPU/proj/cmake/CMakeLists.txt index 5741751cb5..dbc1f4bd14 100644 --- a/samples/_opengl/ParticleSphereCPU/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/ParticleSphereCPU/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ParticleSphereCPUApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/ParticleSphereCS/proj/cmake/CMakeLists.txt b/samples/_opengl/ParticleSphereCS/proj/cmake/CMakeLists.txt index 353854773f..f37cd22834 100644 --- a/samples/_opengl/ParticleSphereCS/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/ParticleSphereCS/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ParticleSphereCSApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/ParticleSphereGPU/proj/cmake/CMakeLists.txt b/samples/_opengl/ParticleSphereGPU/proj/cmake/CMakeLists.txt index fc5b16391f..a7317e4071 100644 --- a/samples/_opengl/ParticleSphereGPU/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/ParticleSphereGPU/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ParticleSphereGPUApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/ParticlesBasic/proj/cmake/CMakeLists.txt b/samples/_opengl/ParticlesBasic/proj/cmake/CMakeLists.txt index 2aacd94d8b..ddd7a384f3 100644 --- a/samples/_opengl/ParticlesBasic/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/ParticlesBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ParticlesBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/PickingFBO/proj/cmake/CMakeLists.txt b/samples/_opengl/PickingFBO/proj/cmake/CMakeLists.txt index 4ee9072848..4b78cafa18 100644 --- a/samples/_opengl/PickingFBO/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/PickingFBO/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/PickingFBOApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/PostProcessingAA/proj/cmake/CMakeLists.txt b/samples/_opengl/PostProcessingAA/proj/cmake/CMakeLists.txt index 96651cb0a9..567543e6c8 100644 --- a/samples/_opengl/PostProcessingAA/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/PostProcessingAA/proj/cmake/CMakeLists.txt @@ -18,4 +18,5 @@ set( SRC_FILES ci_make_app( SOURCES ${SRC_FILES} CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/ShadowMapping/proj/cmake/CMakeLists.txt b/samples/_opengl/ShadowMapping/proj/cmake/CMakeLists.txt index 2da8d574ff..e04b0582bb 100644 --- a/samples/_opengl/ShadowMapping/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/ShadowMapping/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ShadowMappingApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/ShadowMappingBasic/proj/cmake/CMakeLists.txt b/samples/_opengl/ShadowMappingBasic/proj/cmake/CMakeLists.txt index 694bcad35c..63ce01c3ee 100644 --- a/samples/_opengl/ShadowMappingBasic/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/ShadowMappingBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ShadowMappingBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/StencilReflection/proj/cmake/CMakeLists.txt b/samples/_opengl/StencilReflection/proj/cmake/CMakeLists.txt index 63c8bc543b..3ed71cbc34 100644 --- a/samples/_opengl/StencilReflection/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/StencilReflection/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/StencilReflectionApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/SuperformulaGPU/proj/cmake/CMakeLists.txt b/samples/_opengl/SuperformulaGPU/proj/cmake/CMakeLists.txt index 4737d75ee9..dfc686b822 100644 --- a/samples/_opengl/SuperformulaGPU/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/SuperformulaGPU/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/SuperformulaGPUApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/TessellationBasic/proj/cmake/CMakeLists.txt b/samples/_opengl/TessellationBasic/proj/cmake/CMakeLists.txt index 4f435d33fe..6de9a0a80a 100644 --- a/samples/_opengl/TessellationBasic/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/TessellationBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/TessellationBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/TessellationBezier/proj/cmake/CMakeLists.txt b/samples/_opengl/TessellationBezier/proj/cmake/CMakeLists.txt index 61a7b2a831..3c696486d2 100644 --- a/samples/_opengl/TessellationBezier/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/TessellationBezier/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/TessellationBezierApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/TransformFeedbackSmokeParticles/proj/cmake/CMakeLists.txt b/samples/_opengl/TransformFeedbackSmokeParticles/proj/cmake/CMakeLists.txt index 8b7dc82266..3e362d463e 100644 --- a/samples/_opengl/TransformFeedbackSmokeParticles/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/TransformFeedbackSmokeParticles/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/TransformFeedbackSmokeParticlesApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_opengl/VboMesh/proj/cmake/CMakeLists.txt b/samples/_opengl/VboMesh/proj/cmake/CMakeLists.txt index 9591fd4a29..60c076a938 100644 --- a/samples/_opengl/VboMesh/proj/cmake/CMakeLists.txt +++ b/samples/_opengl/VboMesh/proj/cmake/CMakeLists.txt @@ -13,4 +13,5 @@ ci_make_app( CINDER_PATH ${CINDER_PATH} INCLUDES ${APP_PATH}/include RESOURCES ${APP_PATH}/../../data/cinder_logo.png + FOLDER "cinder/samples/_opengl" ) diff --git a/samples/_svg/AnimatedReveal/proj/cmake/CMakeLists.txt b/samples/_svg/AnimatedReveal/proj/cmake/CMakeLists.txt index 2c0d69d743..d93f3c2115 100644 --- a/samples/_svg/AnimatedReveal/proj/cmake/CMakeLists.txt +++ b/samples/_svg/AnimatedReveal/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/AnimatedRevealApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_svg" ) diff --git a/samples/_svg/EuroMap/proj/cmake/CMakeLists.txt b/samples/_svg/EuroMap/proj/cmake/CMakeLists.txt index 6ac3740553..21fd6ad00d 100644 --- a/samples/_svg/EuroMap/proj/cmake/CMakeLists.txt +++ b/samples/_svg/EuroMap/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/EuroMapApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_svg" ) diff --git a/samples/_svg/GoodNightMorning/proj/cmake/CMakeLists.txt b/samples/_svg/GoodNightMorning/proj/cmake/CMakeLists.txt index 3fdeebd634..8c38d63ffc 100644 --- a/samples/_svg/GoodNightMorning/proj/cmake/CMakeLists.txt +++ b/samples/_svg/GoodNightMorning/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/GoodNightMorningApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_svg" ) diff --git a/samples/_svg/SimpleViewer/proj/cmake/CMakeLists.txt b/samples/_svg/SimpleViewer/proj/cmake/CMakeLists.txt index c38394e358..b52a7f6533 100644 --- a/samples/_svg/SimpleViewer/proj/cmake/CMakeLists.txt +++ b/samples/_svg/SimpleViewer/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/SimpleViewerApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_svg" ) diff --git a/samples/_timeline/BasicAppendTween/proj/cmake/CMakeLists.txt b/samples/_timeline/BasicAppendTween/proj/cmake/CMakeLists.txt index e03f6874f1..c477421291 100644 --- a/samples/_timeline/BasicAppendTween/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/BasicAppendTween/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/BasicAppendTweenApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_timeline" ) diff --git a/samples/_timeline/BasicTween/proj/cmake/CMakeLists.txt b/samples/_timeline/BasicTween/proj/cmake/CMakeLists.txt index 6c505f821e..87461de872 100644 --- a/samples/_timeline/BasicTween/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/BasicTween/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/BasicTweenApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_timeline" ) diff --git a/samples/_timeline/CustomCallback/proj/cmake/CMakeLists.txt b/samples/_timeline/CustomCallback/proj/cmake/CMakeLists.txt index 5d49b775e8..8a1646b1fc 100644 --- a/samples/_timeline/CustomCallback/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/CustomCallback/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/CustomCallbackApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_timeline" ) diff --git a/samples/_timeline/CustomLerp/proj/cmake/CMakeLists.txt b/samples/_timeline/CustomLerp/proj/cmake/CMakeLists.txt index 3016002f92..10159750b5 100644 --- a/samples/_timeline/CustomLerp/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/CustomLerp/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/CustomLerpApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_timeline" ) diff --git a/samples/_timeline/DragTween/proj/cmake/CMakeLists.txt b/samples/_timeline/DragTween/proj/cmake/CMakeLists.txt index 4421775976..a80f3a9f10 100644 --- a/samples/_timeline/DragTween/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/DragTween/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/DragTweenApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_timeline" ) diff --git a/samples/_timeline/ImageAccordion/proj/cmake/CMakeLists.txt b/samples/_timeline/ImageAccordion/proj/cmake/CMakeLists.txt index 59acb84f95..4a313a8b04 100644 --- a/samples/_timeline/ImageAccordion/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/ImageAccordion/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/ImageAccordionApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_timeline" ) diff --git a/samples/_timeline/PaletteBrowser/proj/cmake/CMakeLists.txt b/samples/_timeline/PaletteBrowser/proj/cmake/CMakeLists.txt index a8a4327246..9299c12947 100644 --- a/samples/_timeline/PaletteBrowser/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/PaletteBrowser/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/PaletteBrowserApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_timeline" ) diff --git a/samples/_timeline/TextInputTween/proj/cmake/CMakeLists.txt b/samples/_timeline/TextInputTween/proj/cmake/CMakeLists.txt index a4aa818a99..563490902a 100644 --- a/samples/_timeline/TextInputTween/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/TextInputTween/proj/cmake/CMakeLists.txt @@ -18,4 +18,5 @@ ci_make_app( INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} RESOURCES ${APP_PATH}/resources/Alfphabet-IV.ttf + FOLDER "cinder/samples/_timeline" ) diff --git a/samples/_timeline/VisualDictionary/proj/cmake/CMakeLists.txt b/samples/_timeline/VisualDictionary/proj/cmake/CMakeLists.txt index 38b5e20d09..f75cd90cef 100644 --- a/samples/_timeline/VisualDictionary/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/VisualDictionary/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/VisualDictionaryApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples/_timeline" ) diff --git a/samples/perlinTest/proj/cmake/CMakeLists.txt b/samples/perlinTest/proj/cmake/CMakeLists.txt index 1ce19f9cd4..2fc615e2f4 100644 --- a/samples/perlinTest/proj/cmake/CMakeLists.txt +++ b/samples/perlinTest/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/perlinTestApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) diff --git a/samples/slerpBasic/proj/cmake/CMakeLists.txt b/samples/slerpBasic/proj/cmake/CMakeLists.txt index bba3036ae8..4c68ec8068 100644 --- a/samples/slerpBasic/proj/cmake/CMakeLists.txt +++ b/samples/slerpBasic/proj/cmake/CMakeLists.txt @@ -11,4 +11,5 @@ include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( SOURCES ${APP_PATH}/src/slerpBasicApp.cpp CINDER_PATH ${CINDER_PATH} + FOLDER "cinder/samples" ) From 6363984358b72becc16df5c06580bbb5f9fd8024 Mon Sep 17 00:00:00 2001 From: Hai Nguyen Date: Fri, 31 Dec 2021 20:10:10 -0500 Subject: [PATCH 3/4] Fixed typo in source group --- proj/cmake/libcinder_source_files.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proj/cmake/libcinder_source_files.cmake b/proj/cmake/libcinder_source_files.cmake index 3ecc8f8bf9..8f8b712768 100644 --- a/proj/cmake/libcinder_source_files.cmake +++ b/proj/cmake/libcinder_source_files.cmake @@ -370,7 +370,7 @@ list( APPEND SRC_SET_CINDER_SVG list( APPEND CINDER_SRC_FILES ${HDR_SET_CINDER_SVG} ) list( APPEND CINDER_SRC_FILES ${SRC_SET_CINDER_SVG} ) source_group( "Header Files\\cinder\\svg" FILES ${HDR_SET_CINDER_SVG} ) -source_group( "Source Files\\ccinder\\svg" FILES ${SRC_SET_CINDER_SVG} ) +source_group( "Source Files\\cinder\\svg" FILES ${SRC_SET_CINDER_SVG} ) # ---------------------------------------------------------------------------------------------------------------------- # tinyexr From 022717d7b294fcd37900b6860c35232bee22a5e3 Mon Sep 17 00:00:00 2001 From: Hai Nguyen Date: Thu, 6 Jan 2022 14:16:43 -0500 Subject: [PATCH 4/4] Added gl.h to headers --- proj/cmake/libcinder_source_files.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/proj/cmake/libcinder_source_files.cmake b/proj/cmake/libcinder_source_files.cmake index 8f8b712768..86b8518824 100644 --- a/proj/cmake/libcinder_source_files.cmake +++ b/proj/cmake/libcinder_source_files.cmake @@ -258,6 +258,7 @@ list( APPEND HDR_SET_CINDER_GL ${CINDER_INC_DIR}/cinder/gl/draw.h ${CINDER_INC_DIR}/cinder/gl/Environment.h ${CINDER_INC_DIR}/cinder/gl/Fbo.h + ${CINDER_INC_DIR}/cinder/gl/gl.h ${CINDER_INC_DIR}/cinder/gl/GlslProg.h ${CINDER_INC_DIR}/cinder/gl/Pbo.h ${CINDER_INC_DIR}/cinder/gl/Query.h