Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake updates for library and samples to improve quality of life in VS #2264

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

CMake updates for library and samples to improve quality of life in VS #2264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e65f095
CMake changes to make source browsing easier in Visual Studio
chaoticbob Dec 31, 2021
6f6c417
Merge branch 'master' into cmake-updates
chaoticbob Dec 31, 2021
1d50e38
Added FOLDER property for samples to add more organization in Visual …
chaoticbob Jan 1, 2022
6363984
Fixed typo in source group
chaoticbob Jan 1, 2022
022717d
Added gl.h to headers
chaoticbob Jan 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')." )
Expand Down
2 changes: 2 additions & 0 deletions blocks/Box2D/proj/cmake/Box2DConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
5 changes: 5 additions & 0 deletions proj/cmake/configure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
202 changes: 186 additions & 16 deletions proj/cmake/libcinder_source_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -123,24 +220,64 @@ 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
${CINDER_SRC_DIR}/cinder/audio/dsp/Dsp.cpp
${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/gl.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
Expand Down Expand Up @@ -175,13 +312,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
Expand All @@ -197,19 +351,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\\cinder\\svg" FILES ${SRC_SET_CINDER_SVG} )

# ----------------------------------------------------------------------------------------------------------------------
# tinyexr
Expand Down Expand Up @@ -297,6 +459,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
Expand All @@ -315,16 +480,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
Expand All @@ -337,10 +505,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()

Expand Down
3 changes: 2 additions & 1 deletion proj/cmake/libcinder_target.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}" )
Expand Down
7 changes: 6 additions & 1 deletion proj/cmake/modules/cinderMakeApp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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} )
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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} )
Expand Down
Loading