Skip to content
This repository has been archived by the owner on Apr 22, 2020. It is now read-only.

Updated Sample CMakeLists and moved to proj/cmake dir. Builds on linux #71

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,10 @@ ipch/
.vs
**/vc2013/enc_temp_folder/**
**/vc2015/enc_temp_folder/**

# Linux
**/cmake/CMakeCache.txt
**/cmake/CMakeFiles
**/cmake/Makefile
**/cmake/cmake_install.cmake
**/cmake/libCinder-ImGui.a
47 changes: 0 additions & 47 deletions samples/Basic/linux/CMakeLists.txt

This file was deleted.

2 changes: 0 additions & 2 deletions samples/Basic/linux/cibuild

This file was deleted.

25 changes: 25 additions & 0 deletions samples/Basic/proj/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Basic
cmake_minimum_required( VERSION 2.8 FATAL_ERROR )
set( CMAKE_VERBOSE_MAKEFILE on )

project( BasicApp )

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" )

file(GLOB SRC_FILES_GLOB
${APP_PATH}/*
)

set( SRC_FILES
${SRC_FILES_GLOB}
)

ci_make_app(
SOURCES ${APP_PATH}/src/BasicApp.cpp
CINDER_PATH ${CINDER_PATH}
BLOCKS ${CINDER_PATH}/blocks/Cinder-ImGui
)

2 changes: 1 addition & 1 deletion samples/Basic/src/BasicApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void BasicApp::update()

if( showDemoWindow ){
// have a look at this function for more examples
ui::ShowDemoWindow();
//ui::ShowDemoWindow();
}


Expand Down