diff --git a/blocks/Box2D/templates/Basic Box2D/proj/cmake/CMakeLists.txt b/blocks/Box2D/templates/Basic Box2D/proj/cmake/CMakeLists.txt new file mode 100644 index 0000000000..6e36f2e1c1 --- /dev/null +++ b/blocks/Box2D/templates/Basic Box2D/proj/cmake/CMakeLists.txt @@ -0,0 +1,17 @@ +cmake_minimum_required( VERSION 2.8 FATAL_ERROR ) +set( CMAKE_VERBOSE_MAKEFILE ON ) + +project( BasicBox2D ) +set( APP_NAME "${PROJECT_NAME}App" ) + +get_filename_component( CINDER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.." ABSOLUTE ) +get_filename_component( APP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../" ABSOLUTE ) + +include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) + +ci_make_app( + APP_NAME ${APP_NAME} + SOURCES ${APP_PATH}/src/_TBOX_PREFIX_App.cpp + CINDER_PATH ${CINDER_PATH} + BLOCKS Box2D +) diff --git a/blocks/Clipper/proj/cmake/ClipperConfig.cmake b/blocks/Clipper/proj/cmake/ClipperConfig.cmake new file mode 100644 index 0000000000..9b20b56310 --- /dev/null +++ b/blocks/Clipper/proj/cmake/ClipperConfig.cmake @@ -0,0 +1,10 @@ +if( NOT TARGET Clipper ) + get_filename_component( CLIPPER_SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../src" ABSOLUTE ) + + add_library( CLIPPER + ${CLIPPER_SOURCE_PATH}/clipper.cpp + ${CLIPPER_SOURCE_PATH}/CinderClipper.cpp + ) + + target_include_directories( CLIPPER PUBLIC "${CLIPPER_SOURCE_PATH}"/../include ) +endif() diff --git a/blocks/OSC/test/Test/proj/cmake/CMakeLists.txt b/blocks/OSC/test/Test/proj/cmake/CMakeLists.txt new file mode 100644 index 0000000000..6dbf61db4e --- /dev/null +++ b/blocks/OSC/test/Test/proj/cmake/CMakeLists.txt @@ -0,0 +1,15 @@ +cmake_minimum_required( VERSION 2.8 FATAL_ERROR ) +set( CMAKE_VERBOSE_MAKEFILE ON ) + +project( OSC-Test ) + +get_filename_component( CINDER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.." ABSOLUTE ) +get_filename_component( APP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../" ABSOLUTE ) + +include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) + +ci_make_app( + SOURCES ${APP_PATH}/src/TestApp.cpp + CINDER_PATH ${CINDER_PATH} + BLOCKS OSC +) diff --git a/blocks/__AppTemplates/BasicApp/OpenGL/proj/cmake/CMakeLists.txt b/blocks/__AppTemplates/BasicApp/OpenGL/proj/cmake/CMakeLists.txt new file mode 100644 index 0000000000..a3cd6d048a --- /dev/null +++ b/blocks/__AppTemplates/BasicApp/OpenGL/proj/cmake/CMakeLists.txt @@ -0,0 +1,23 @@ +cmake_minimum_required( VERSION 2.8 FATAL_ERROR ) +set( CMAKE_VERBOSE_MAKEFILE ON ) + +project( Basic ) + +get_filename_component( CINDER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../../.." ABSOLUTE ) +get_filename_component( APP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../" ABSOLUTE ) + +# wildcard on resources +file (GLOB APP_RESOURCES + ${APP_PATH}/resources/* +) + +include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) + +ci_make_app( + APP_NAME ${PROJECT_NAME}App + CINDER_PATH ${CINDER_PATH} + SOURCES ${APP_PATH}/src/_TBOX_PREFIX_App.cpp + INCLUDES ${APP_PATH}/include + RESOURCES ${APP_RESOURCES} + ASSETS_PATH ${APP_PATH}/assets +) diff --git a/proj/cmake/modules/findCMakeDirs.cmake b/proj/cmake/modules/findCMakeDirs.cmake index 2948740500..a088f72ee7 100644 --- a/proj/cmake/modules/findCMakeDirs.cmake +++ b/proj/cmake/modules/findCMakeDirs.cmake @@ -6,7 +6,7 @@ macro( findCMakeDirs RESULT_PATHS BASE_PATH SKIP_PATHS ) set( shouldSkip FALSE ) foreach( skip ${SKIP_PATHS} ) if( f MATCHES ".*${skip}" ) - ci_log_v( "---- [findCMakeDirs] skipping path: ${f}" ) + message( "---- [findCMakeDirs] skipping path: ${f}" ) set( shouldSkip TRUE ) break() endif() diff --git a/proj/cmake/platform_linux.cmake b/proj/cmake/platform_linux.cmake index ac9b355bde..e6605d3be9 100644 --- a/proj/cmake/platform_linux.cmake +++ b/proj/cmake/platform_linux.cmake @@ -4,6 +4,31 @@ set( CMAKE_VERBOSE_MAKEFILE ON ) set( CINDER_PLATFORM "Posix" ) +# Some samples are not available on Linux +list( APPEND CINDER_SKIP_SAMPLES + # Renderer2D is required for: + FontSample + perlinTest + BSpline + CairoBasic + Wisteria + Renderer2dBasic + # Capture class is required for: + CaptureBasic + CaptureCube + # Apple only: + MotionBasic # (uses MotionManager block) + Compass # (uses MotionManager block) + LocationManager # (uses LocationManager block) + iosKeyboard + iosNativeControl + # Quicktime has no linux support: + QuickTimeAdvanced + QuickTimeAvfWriter + QuickTimeBasic + QuickTimeIteration +) + # When CINDER_HEADLESS is set, ${SRC_SET_GLFW} will *not* be compiled. list( APPEND SRC_SET_GLFW ${CINDER_SRC_DIR}/glfw/src/context.c diff --git a/samples/ArcballDemo/proj/cmake/CMakeLists.txt b/samples/ArcballDemo/proj/cmake/CMakeLists.txt index 9b426f318e..cfe0223f9e 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 + RESOURCES ${APP_PATH}/../data/earth.jpg ) diff --git a/samples/CameraPersp/proj/cmake/CMakeLists.txt b/samples/CameraPersp/proj/cmake/CMakeLists.txt index e4a37f0528..22d5c2876e 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} + RESOURCES ${APP_PATH}/../data/environment_maps/humus_sf.jpg ) diff --git a/samples/HighDensityDisplay/proj/cmake/CMakeLists.txt b/samples/HighDensityDisplay/proj/cmake/CMakeLists.txt new file mode 100644 index 0000000000..73558c4535 --- /dev/null +++ b/samples/HighDensityDisplay/proj/cmake/CMakeLists.txt @@ -0,0 +1,15 @@ +cmake_minimum_required( VERSION 2.8 FATAL_ERROR ) +set( CMAKE_VERBOSE_MAKEFILE ON ) + +project( HighIntensityDisplay ) + +get_filename_component( CINDER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../.." ABSOLUTE ) +get_filename_component( APP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../" ABSOLUTE ) + +include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) + +ci_make_app( + SOURCES ${APP_PATH}/src/HighDensityDisplayApp.cpp + CINDER_PATH ${CINDER_PATH} + INCLUDES ${APP_PATH}/include +) diff --git a/samples/SurfaceBasic/proj/cmake/CMakeLists.txt b/samples/SurfaceBasic/proj/cmake/CMakeLists.txt index 336e782965..d2da952da3 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} + RESOURCES ${APP_PATH}/../data/cinder_logo.png ) diff --git a/samples/_opengl/LevelOfDetailBasic/proj/cmake/CMakeLists.txt b/samples/_opengl/LevelOfDetailBasic/proj/cmake/CMakeLists.txt new file mode 100644 index 0000000000..4023229255 --- /dev/null +++ b/samples/_opengl/LevelOfDetailBasic/proj/cmake/CMakeLists.txt @@ -0,0 +1,14 @@ +cmake_minimum_required( VERSION 2.8 FATAL_ERROR ) +set( CMAKE_VERBOSE_MAKEFILE ON ) + +project( opengl-LevelOfDetailBasic ) + +get_filename_component( CINDER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../.." ABSOLUTE ) +get_filename_component( APP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../" ABSOLUTE ) + +include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) + +ci_make_app( + SOURCES ${APP_PATH}/src/LevelOfDetailBasicApp.cpp + CINDER_PATH ${CINDER_PATH} +) diff --git a/samples/_opengl/ParticlesBasic/src/ParticlesBasicApp.cpp b/samples/_opengl/ParticlesBasic/src/ParticlesBasicApp.cpp index 448a0399cc..6d466a5caf 100644 --- a/samples/_opengl/ParticlesBasic/src/ParticlesBasicApp.cpp +++ b/samples/_opengl/ParticlesBasic/src/ParticlesBasicApp.cpp @@ -136,4 +136,4 @@ bool BasicParticleApp::isOffscreen( const vec2 &v ) return ( ( v.x < 0 ) || ( v.x > getWindowWidth() ) || ( v.y < 0 ) || ( v.y > getWindowHeight() ) ); } -CINDER_APP( BasicParticleApp, RendererGl ) \ No newline at end of file +CINDER_APP( BasicParticleApp, RendererGl ) diff --git a/samples/_opengl/VboMesh/src/VboMeshApp.cpp b/samples/_opengl/VboMesh/src/VboMeshApp.cpp index 65156f1e06..5cd48b5d75 100644 --- a/samples/_opengl/VboMesh/src/VboMeshApp.cpp +++ b/samples/_opengl/VboMesh/src/VboMeshApp.cpp @@ -7,7 +7,7 @@ #include "cinder/app/App.h" #include "cinder/app/RendererGl.h" #include "cinder/gl/gl.h" -#include "cinder/GeomIO.h" +#include "cinder/GeomIo.h" #include "cinder/ImageIo.h" #include "cinder/CameraUi.h" diff --git a/samples/_timeline/ImageAccordion/proj/cmake/CMakeLists.txt b/samples/_timeline/ImageAccordion/proj/cmake/CMakeLists.txt index 9893f110ce..afbcc6fab8 100644 --- a/samples/_timeline/ImageAccordion/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/ImageAccordion/proj/cmake/CMakeLists.txt @@ -5,10 +5,24 @@ project( timeline-ImageAccordion ) get_filename_component( CINDER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../../.." ABSOLUTE ) get_filename_component( APP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../" ABSOLUTE ) +get_filename_component( DATA_PATH "${APP_PATH}/../../data" ABSOLUTE ) + +list( APPEND RESOURCES + ${DATA_PATH}/photo_1.jpg + ${DATA_PATH}/photo_2.jpg + ${DATA_PATH}/photo_3.jpg + ${DATA_PATH}/photo_4.jpg + ${DATA_PATH}/photo_5.jpg + ${DATA_PATH}/photo_6.jpg + ${DATA_PATH}/photo_7.jpg + ${DATA_PATH}/photo_8.jpg + ) include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) ci_make_app( - SOURCES ${APP_PATH}/src/ImageAccordionApp.cpp + SOURCES ${APP_PATH}/src/ImageAccordionApp.cpp ${APP_PATH}/src/AccordionItem.cpp CINDER_PATH ${CINDER_PATH} + INCLUDES ${APP_PATH}/include + RESOURCES ${RESOURCES} ) diff --git a/samples/_timeline/ImageAccordion/src/ImageAccordionApp.cpp b/samples/_timeline/ImageAccordion/src/ImageAccordionApp.cpp index a3dfa7ccf1..cd4c20d6a0 100644 --- a/samples/_timeline/ImageAccordion/src/ImageAccordionApp.cpp +++ b/samples/_timeline/ImageAccordion/src/ImageAccordionApp.cpp @@ -13,7 +13,7 @@ #include "cinder/app/App.h" #include "cinder/app/RendererGl.h" #include "cinder/gl/gl.h" -#include "cinder/ImageIO.h" +#include "cinder/ImageIo.h" #include "cinder/Rand.h" #include "cinder/Timeline.h" @@ -198,4 +198,4 @@ void ImageAccordionApp::draw() } } -CINDER_APP( ImageAccordionApp, RendererGl( RendererGl::Options().msaa( 4 ) ) ) \ No newline at end of file +CINDER_APP( ImageAccordionApp, RendererGl( RendererGl::Options().msaa( 4 ) ) ) diff --git a/samples/_timeline/PaletteBrowser/proj/cmake/CMakeLists.txt b/samples/_timeline/PaletteBrowser/proj/cmake/CMakeLists.txt index 7ef0167f61..853f6d1305 100644 --- a/samples/_timeline/PaletteBrowser/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/PaletteBrowser/proj/cmake/CMakeLists.txt @@ -8,7 +8,14 @@ get_filename_component( APP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../" ABSOLUTE ) include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) +list( APPEND PBSOURCES + ${APP_PATH}/src/PaletteBrowserApp.cpp + ${APP_PATH}/src/Item.cpp + ${APP_PATH}/src/Swatch.cpp + ) + ci_make_app( - SOURCES ${APP_PATH}/src/PaletteBrowserApp.cpp + SOURCES ${PBSOURCES} + INCLUDES ${APP_PATH}/include CINDER_PATH ${CINDER_PATH} ) diff --git a/samples/_timeline/VisualDictionary/proj/cmake/CMakeLists.txt b/samples/_timeline/VisualDictionary/proj/cmake/CMakeLists.txt index 8f35bd2a30..d8dd986621 100644 --- a/samples/_timeline/VisualDictionary/proj/cmake/CMakeLists.txt +++ b/samples/_timeline/VisualDictionary/proj/cmake/CMakeLists.txt @@ -8,7 +8,15 @@ get_filename_component( APP_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../" ABSOLUTE ) include( "${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake" ) +list( APPEND SOURCES + ${APP_PATH}/src/VisualDictionaryApp.cpp + ${APP_PATH}/src/CenterState.cpp + ${APP_PATH}/src/Dictionary.cpp + ${APP_PATH}/src/WordNode.cpp + ) + ci_make_app( - SOURCES ${APP_PATH}/src/VisualDictionaryApp.cpp + SOURCES ${SOURCES} CINDER_PATH ${CINDER_PATH} + INCLUDES ${APP_PATH}/include )