Changed layout of find_object folders... moved main.cpp to app folder (prepare for ros externals...)

git-svn-id: http://find-object.googlecode.com/svn/trunk/find_object@30 620bd6b2-0a58-f614-fd9a-1bd335dccda9
This commit is contained in:
matlabbe 2011-11-23 14:02:53 +00:00
parent 0f43d7d86c
commit 45f6b9fd17
3 changed files with 17 additions and 16 deletions

View File

@ -57,7 +57,7 @@ IF(APPLE AND BUILD_AS_BUNDLE)
ENDIF(APPLE AND BUILD_AS_BUNDLE) ENDIF(APPLE AND BUILD_AS_BUNDLE)
####### SOURCES (Projects) ####### ####### SOURCES (Projects) #######
ADD_SUBDIRECTORY( src ) ADD_SUBDIRECTORY( app )
ADD_SUBDIRECTORY( example ) ADD_SUBDIRECTORY( example )

View File

@ -2,16 +2,16 @@
### Qt Gui stuff ### ### Qt Gui stuff ###
SET(headers_ui SET(headers_ui
./MainWindow.h ../src/MainWindow.h
./AddObjectDialog.h ../src/AddObjectDialog.h
./ObjWidget.h ../src/ObjWidget.h
./Camera.h ../src/Camera.h
./ParametersToolBox.h ../src/ParametersToolBox.h
) )
SET(uis SET(uis
./ui/mainWindow.ui ../src/ui/mainWindow.ui
./ui/addObjectDialog.ui ../src/ui/addObjectDialog.ui
) )
#SET(qrc #SET(qrc
@ -30,21 +30,22 @@ QT4_WRAP_CPP(moc_srcs ${headers_ui})
SET(SRC_FILES SET(SRC_FILES
./MainWindow.cpp
./AddObjectDialog.cpp
./KeypointItem.cpp
./qtipl.cpp
./main.cpp ./main.cpp
./Camera.cpp ../src/MainWindow.cpp
./ParametersToolBox.cpp ../src/AddObjectDialog.cpp
./Settings.cpp ../src/KeypointItem.cpp
./ObjWidget.cpp ../src/qtipl.cpp
../src/Camera.cpp
../src/ParametersToolBox.cpp
../src/Settings.cpp
../src/ObjWidget.cpp
${moc_srcs} ${moc_srcs}
${moc_uis} ${moc_uis}
#${srcs_qrc} #${srcs_qrc}
) )
SET(INCLUDE_DIRS SET(INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/../src
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${OpenCV_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} # for qt ui generated in binary dir ${CMAKE_CURRENT_BINARY_DIR} # for qt ui generated in binary dir