Commit fa6114ca authored by math's avatar math
Browse files

* Adjusted all CMakeLists.txt to a common style

* Removed the LIST in CMakesLists.txt to use globbing, so not every new file must be inserted.
* Renamed icons.h and bCognize.h according to our CodingStandard
* Set the owner of every ToDo to wiebel :)
parent 093f5bd5
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT( BrainCognize )
# Package dependencies
# Package dependencies:
FIND_PACKAGE( Qt4 REQUIRED )
FIND_PACKAGE( OpenGL REQUIRED )
FIND_PACKAGE( Boost REQUIRED )
# Includes
# Includes:
INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${OPENGL_INCLUDE_DIR} )
SET(
QT_LINK_LIBRARIES
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTOPENGL_LIBRARY}
)
# Libraries for linking:
SET( QT_LINK_LIBRARIES ${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTOPENGL_LIBRARY} )
SET( LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib )
SET( LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib )
MARK_AS_ADVANCED( LIBRARY_OUTPUT_PATH )
SET( EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin )
MARK_AS_ADVANCED( EXECUTABLE_OUTPUT_PATH )
# Global compiler flags:
#-----------------------
# -Wno-long-long is used since on Ubuntu 8.10 it won't compile without it
# -Wno-long-long since on Ubuntu 8.10 it won't compile without it
# -ansi force ISO-C++98 compliance (not GNU++98)
SET( CMAKE_CXX_FLAGS "-Wall -pedantic -ansi -Wno-long-long" )
ADD_SUBDIRECTORY( math )
......@@ -34,37 +31,24 @@ ADD_SUBDIRECTORY( dataHandler )
ADD_SUBDIRECTORY( graphicsEngine )
ADD_SUBDIRECTORY( gui )
ADD_SUBDIRECTORY( plugins )
ADD_EXECUTABLE( bCognize bCognize.cpp )
ADD_EXECUTABLE( BCognize BCognize.cpp )
TARGET_LINK_LIBRARIES( BCognize guiqt4 ${QT_LINK_LIBRARIES} )
TARGET_LINK_LIBRARIES(
bCognize
guiqt4
${QT_LINK_LIBRARIES}
)
#---------------------
# Special make tagets
#---------------------
# Special targets:
#-----------------
# Creates API via Doxygen
ADD_CUSTOM_TARGET(doc
COMMAND doxygen ${PROJECT_SOURCE_DIR}/../doc/developer/doxygenConfig > ${PROJECT_SOURCE_DIR}/../doc/developer/docErr.txt 2>&1
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/..
COMMENT "Build doxygen documentation"
VERBATIM
)
ADD_CUSTOM_TARGET(docs
COMMAND echo "If you would like to build the documentation issue 'make doc', i.e. remove the trailing 's'."
COMMAND exit 1
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/..
COMMENT "Hint for for peope who are used to using 'make docs' instead of 'make doc'."
VERBATIM
)
VERBATIM )
# Checks style guide lines via the BrainLint tool against all source code files
FILE(GLOB_RECURSE STYLE_CPP ${PROJECT_SOURCE_DIR}/*.cpp)
FILE(GLOB_RECURSE STYLE_H ${PROJECT_SOURCE_DIR}/*.h)
ADD_CUSTOM_TARGET(stylecheck
COMMAND ${PROJECT_SOURCE_DIR}/../tools/brainlint.py ${STYLE_CPP} ${STYLE_H}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Check if code complies to CodingStandard"
)
COMMENT "Check if code complies to CodingStandard" )
......@@ -11,12 +11,12 @@
BGLScenePainter::BGLScenePainter()
{
// TODO Auto-generated constructor stub
// TODO(wiebel): Auto-generated constructor stub
}
BGLScenePainter::~BGLScenePainter()
{
// TODO Auto-generated destructor stub
// TODO(wiebel): Auto-generated destructor stub
}
void BGLScenePainter::initGL()
......
list( APPEND GE_SRC
BGLScenePainter.cpp
)
FILE(GLOB GE_SRC "*.cpp")
add_library( ge SHARED ${GE_SRC} )
\ No newline at end of file
ADD_LIBRARY( ge SHARED ${GE_SRC} )
......@@ -8,10 +8,10 @@
BGUI::BGUI()
{
// TODO Auto-generated constructor stub
// TODO(wiebel): Auto-generated constructor stub
}
BGUI::~BGUI()
{
// TODO Auto-generated destructor stub
// TODO(wiebel): Auto-generated destructor stub
}
add_subdirectory( qt4 )
ADD_SUBDIRECTORY( qt4 )
list( APPEND GUI_SRC
BGUI.cpp
)
FILE(GLOB GUI_SRC "*.cpp")
add_library( gui SHARED ${GUI_SRC} )
\ No newline at end of file
ADD_LIBRARY( gui SHARED ${GUI_SRC} )
......@@ -3,8 +3,8 @@
// Project: BrainCognize
//
//---------------------------------------------------------------------------
#ifndef ICONS_H
#define ICONS_H
#ifndef BICONS_H
#define BICONS_H
/**
* This file is provided to allow to get access to all used icons by one include.
......@@ -14,4 +14,4 @@
#include "fileopen.xpm"
#include "quit.xpm"
#endif // ICONS_H
#endif // BICONS_H
......@@ -23,7 +23,7 @@
class BQtGLWidget;
class BQtPipelineBrowser;
#include "../icons/icons.h"
#include "../icons/BIcons.h"
/**
* \ingroup gui
* This class contains the main window and the layout
......
......@@ -27,12 +27,12 @@ BQtGLWidget::BQtGLWidget( QWidget *parent )
BQtGLWidget::~BQtGLWidget()
{
// TODO Auto-generated destructor stub
// TODO(wiebel): Auto-generated destructor stub
}
void BQtGLWidget::paintGL()
{
// TODO we have to have something automatic in here in the future
// TODO(wiebel): we have to have something automatic in here in the future
m_scenePainter->paintGL();
}
......
list( APPEND GUI_QT4_SRC
BMainWindow.cpp
BQtGLWidget.cpp
BQtPipelineBrowser.cpp
)
add_library( guiqt4 SHARED ${GUI_QT4_SRC} )
target_link_libraries( guiqt4 gui ge )
\ No newline at end of file
FILE(GLOB GUI_QT4_SRC "*.cpp")
ADD_LIBRARY( guiqt4 SHARED ${GUI_QT4_SRC} )
TARGET_LINK_LIBRARIES( guiqt4 gui ge )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment