From 50d20b9df6af8530c6f771b152f2a696d8ac65a8 Mon Sep 17 00:00:00 2001 From: Pierre Schefler Date: Sat, 11 Jan 2020 02:45:40 +0100 Subject: [PATCH 01/11] Added cmakes in blocks/ - box2D and basicapp --- .../Basic Box2D/proj/cmake/CMakeLists.txt | 17 ++++++++++++++ .../BasicApp/OpenGL/proj/cmake/CMakeLists.txt | 23 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 blocks/Box2D/templates/Basic Box2D/proj/cmake/CMakeLists.txt create mode 100644 blocks/__AppTemplates/BasicApp/OpenGL/proj/cmake/CMakeLists.txt 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/__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 +) From 7062d87793fea5188e3c5a5ed115771bedfb81ad Mon Sep 17 00:00:00 2001 From: Pierre Schefler Date: Sat, 11 Jan 2020 22:58:13 +0100 Subject: [PATCH 02/11] Added RESOURCES to samples/Arcball cmake --- samples/ArcballDemo/proj/cmake/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) 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 ) From 2fbc4628b35fb4aae222918c755e090035ce8872 Mon Sep 17 00:00:00 2001 From: Pierre Schefler Date: Sun, 12 Jan 2020 21:51:09 +0100 Subject: [PATCH 03/11] Fixed opengl samples for linux --- .../LevelOfDetailBasic/proj/cmake/CMakeLists.txt | 14 ++++++++++++++ .../ParticlesBasic/src/ParticlesBasicApp.cpp | 4 ++-- samples/_opengl/VboMesh/src/VboMeshApp.cpp | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 samples/_opengl/LevelOfDetailBasic/proj/cmake/CMakeLists.txt 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..34bdb6d6c3 100644 --- a/samples/_opengl/ParticlesBasic/src/ParticlesBasicApp.cpp +++ b/samples/_opengl/ParticlesBasic/src/ParticlesBasicApp.cpp @@ -39,7 +39,7 @@ class BasicParticleApp : public App { bool isOffscreen( const vec2 &v ); public: - static const int NUM_PARTICLES = 10000; + static const int NUM_PARTICLES = 100; float mConservationOfVelocity; float mSpeed; @@ -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" From 3b8634950181cbc79e1557878b1b814e13d50001 Mon Sep 17 00:00:00 2001 From: Pierre Schefler Date: Sun, 12 Jan 2020 21:55:49 +0100 Subject: [PATCH 04/11] Fixed samples/SurfaceBasic cmake --- samples/SurfaceBasic/proj/cmake/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) 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 ) From 0a7b4cbca208bffd692241fac88f24b896298942 Mon Sep 17 00:00:00 2001 From: Pierre Schefler Date: Sun, 12 Jan 2020 22:43:45 +0100 Subject: [PATCH 05/11] Added cmakelists for samples/HighDensityDisplay --- .../HighDensityDisplay/proj/cmake/CMakeLists.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 samples/HighDensityDisplay/proj/cmake/CMakeLists.txt 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 +) From 47aaf5bc4cf0454a023dc20690668178361997bc Mon Sep 17 00:00:00 2001 From: Pierre Schefler Date: Sun, 12 Jan 2020 22:55:05 +0100 Subject: [PATCH 06/11] Fixed samples/CameraPersp cmakelists --- samples/CameraPersp/proj/cmake/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) 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 ) From 3c54390c48cce70c399dd88cf1ddc665d562010a Mon Sep 17 00:00:00 2001 From: Pierre Schefler Date: Sun, 12 Jan 2020 23:23:42 +0100 Subject: [PATCH 07/11] Fixed samples/_timeline linux builds --- .../ImageAccordion/proj/cmake/CMakeLists.txt | 16 +++++++++++++++- .../ImageAccordion/src/ImageAccordionApp.cpp | 4 ++-- .../PaletteBrowser/proj/cmake/CMakeLists.txt | 9 ++++++++- .../VisualDictionary/proj/cmake/CMakeLists.txt | 10 +++++++++- 4 files changed, 34 insertions(+), 5 deletions(-) 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 ) From cf35e7c5b76c5d3b2fed949d912ce8239350ca2f Mon Sep 17 00:00:00 2001 From: Pierre Schefler Date: Mon, 13 Jan 2020 00:06:32 +0100 Subject: [PATCH 08/11] Added blocks/Clipper cmake config --- blocks/Clipper/proj/cmake/ClipperConfig.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 blocks/Clipper/proj/cmake/ClipperConfig.cmake 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() From d4fba282c078577e1174f8784614df9458478946 Mon Sep 17 00:00:00 2001 From: Pierre Schefler Date: Mon, 13 Jan 2020 00:14:39 +0100 Subject: [PATCH 09/11] Added cmakelists to blocks/OSC test --- blocks/OSC/test/Test/proj/cmake/CMakeLists.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 blocks/OSC/test/Test/proj/cmake/CMakeLists.txt 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 +) From 86b334265b63ca0460b38117f2236379906582d6 Mon Sep 17 00:00:00 2001 From: Pierre Schefler Date: Thu, 13 Feb 2020 23:52:13 +0100 Subject: [PATCH 10/11] Added list of unsupported samples in linux cmake --- proj/cmake/modules/findCMakeDirs.cmake | 2 +- proj/cmake/platform_linux.cmake | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) 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 From 39aabc8ebdce6c29aadd26378031e05f7bb9a914 Mon Sep 17 00:00:00 2001 From: Pierre Schefler Date: Sat, 15 Feb 2020 00:36:52 +0100 Subject: [PATCH 11/11] Reset original particle number in ParticlesBasicApp sample --- samples/_opengl/ParticlesBasic/src/ParticlesBasicApp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/_opengl/ParticlesBasic/src/ParticlesBasicApp.cpp b/samples/_opengl/ParticlesBasic/src/ParticlesBasicApp.cpp index 34bdb6d6c3..6d466a5caf 100644 --- a/samples/_opengl/ParticlesBasic/src/ParticlesBasicApp.cpp +++ b/samples/_opengl/ParticlesBasic/src/ParticlesBasicApp.cpp @@ -39,7 +39,7 @@ class BasicParticleApp : public App { bool isOffscreen( const vec2 &v ); public: - static const int NUM_PARTICLES = 100; + static const int NUM_PARTICLES = 10000; float mConservationOfVelocity; float mSpeed;