Commit 0a3dffb6 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[FIX] removed trailing spaces

parent 43ce76a0
......@@ -23,7 +23,7 @@
#---------------------------------------------------------------------------
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# General CMake Setup
#
# ---------------------------------------------------------------------------------------------------------------------------------------------------
......@@ -78,7 +78,7 @@ IF( NOT cmake_build_type_tolower STREQUAL "debug" AND
ENDIF()
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# Compilation Options
#
# ---------------------------------------------------------------------------------------------------------------------------------------------------
......@@ -120,17 +120,17 @@ SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DDEBUG -O2" CACHE STRING "" FORCE )
ADD_DEFINITIONS( -DEIGEN_DONT_VECTORIZE -DEIGEN_DONT_ALIGN -DEIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT )
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# OpenWalnut specific options
#
# ---------------------------------------------------------------------------------------------------------------------------------------------------
# other options
# other options
OPTION( OW_HANDLE_SHADERS "This ensures that shaders are available in build directory after build." ON )
OPTION( OW_LINK_SHADERS "If turned on, shaders do not get copied. They get linked. This is a nice option for developers." OFF )
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# REQUIRED third party libs
#
# ---------------------------------------------------------------------------------------------------------------------------------------------------
......@@ -183,7 +183,7 @@ FIND_PACKAGE( OpenSceneGraph ${MIN_OSG_VERSION} REQUIRED osgDB osgUtil osgGA osg
INCLUDE_DIRECTORIES( ${OPENSCENEGRAPH_INCLUDE_DIRS} )
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# OPTIONAL third party libs
# - include only libs you need in the OW framework
#
......@@ -192,7 +192,7 @@ INCLUDE_DIRECTORIES( ${OPENSCENEGRAPH_INCLUDE_DIRS} )
# NOTE: please add only libs which are used in core! If you need a third party lib for your module, include it in your module's CMakeLists!
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# Unit Testing
#
# - We use cxxtest. See http://cxxtest.tigris.org
......@@ -202,7 +202,7 @@ INCLUDE_DIRECTORIES( ${OPENSCENEGRAPH_INCLUDE_DIRS} )
# Try to find it
FIND_PACKAGE( CxxTest QUIET )
MARK_AS_ADVANCED( CXXTEST_PERL_TESTGEN_EXECUTABLE )
# If it is found, and OW_USE_TESTS is on, build the tests and activate CMake's test mechanisms
IF( CXXTEST_FOUND )
# To enable testing
......@@ -228,7 +228,7 @@ ADD_CUSTOM_TARGET( vtest
)
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# Resource Copy
# - This simply copies the structure from ../resources to the build directory
#
......@@ -249,8 +249,8 @@ IF( NOT EXISTS ${OW_CONFIG_DIR}/walnut.cfg )
ENDIF()
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
# Num Cores
#
# Num Cores
# - Number of paralelle operations on this machine
# - Needed by several of our following targets
#
......@@ -270,7 +270,7 @@ IF( NOT CMAKE_GENERATOR MATCHES "Visual Studio" )
ENDIF()
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# Documentation
# - Call doxygen here
#
......@@ -296,7 +296,7 @@ ADD_CUSTOM_TARGET( fulldoc
)
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# Style
# - We use brainlint for this
#
......@@ -306,7 +306,7 @@ ADD_CUSTOM_TARGET( fulldoc
ADD_CUSTOM_TARGET( stylecheck DEPENDS numCores )
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# Convenience targets
#
# ---------------------------------------------------------------------------------------------------------------------------------------------------
......@@ -335,7 +335,7 @@ ADD_CUSTOM_TARGET( many
)
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# Compilation Targets
# - The GUI + OpenWalnut.cpp ==> walnut binary
# - Ext ==> libOWext_*
......@@ -343,7 +343,7 @@ ADD_CUSTOM_TARGET( many
#
# ---------------------------------------------------------------------------------------------------------------------------------------------------
# This script contains all the needed tools to setup the build
# These scripts contains all the needed tools to setup the build
INCLUDE( ${PROJECT_SOURCE_DIR}/../tools/CMakeModules/BuildUtils.cmake )
INCLUDE( ${PROJECT_SOURCE_DIR}/../tools/CMakeModules/BuildModuleUtils.cmake )
......@@ -390,3 +390,9 @@ SET( OWModuleTargetDir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/OpenWalnut )
# build modules
ADD_SUBDIRECTORY( modules )
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
# Installation Targets
#
# ---------------------------------------------------------------------------------------------------------------------------------------------------
......@@ -49,7 +49,7 @@ COLLECT_COMPILE_FILES( "${CMAKE_CURRENT_SOURCE_DIR}" TARGET_CPP_FILES TARGET_H_F
# Setup the target
ADD_LIBRARY( ${LibName} SHARED ${TARGET_CPP_FILES} ${TARGET_H_FILES} )
TARGET_LINK_LIBRARIES( ${LibName} ${OWExtBioSigName} ${OWExtEEPName} ${OWExtNiftiName}
${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${OPENGL_gl_LIBRARY} ${OPENSCENEGRAPH_LIBRARIES}
${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${OPENGL_gl_LIBRARY} ${OPENSCENEGRAPH_LIBRARIES}
)
# ---------------------------------------------------------------------------------------------------------------------------------------------------
......
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# Some modules need third party libraries. We provide them if they are available
#
# ---------------------------------------------------------------------------------------------------------------------------------------------------
......@@ -7,7 +7,7 @@
include( "modules-dependencies.cmake" )
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# Toolbox Setup
#
# ---------------------------------------------------------------------------------------------------------------------------------------------------
......
# ---------------------------------------------------------------------------------------------------------------------------------------------------
#
#
# Some modules need third party libraries. We provide them if they are available
#
# ---------------------------------------------------------------------------------------------------------------------------------------------------
......@@ -8,7 +8,7 @@
# FIND_PACKAGE( Blah )
# IF( BLAH_FOUND )
# OPTION( OW_USE_BLAH "Enable Blah support." )
# IF( OW_USE_BLAH )
# IF( OW_USE_BLAH )
# # do something
# ENDIF( OW_USE_BLAH )
# ENDIF( BLAH_FOUND )
......
......@@ -24,7 +24,7 @@
# Unlike Utils.cmake, this file contains only build related utilities.
# Recursively searches compile files (headers, sources).
# Recursively searches compile files (headers, sources).
# _DirString: where to search
# _CPPFiles contains the cpp files afterwards
# _HFiles contains the h files afterwards, without tests
......@@ -38,11 +38,11 @@ FUNCTION( COLLECT_COMPILE_FILES _DirString _CPPFiles _HFiles _TestFiles )
# the test directories should be excluded from normal compilation completely
FOREACH( file ${H_FILES} )
STRING( REGEX MATCH "^.*\\/test\\/.*" IsTest "${file}" )
IF( IsTest )
IF( IsTest )
LIST( REMOVE_ITEM H_FILES ${file} )
ENDIF( IsTest )
ENDFOREACH( file )
SET( ${_CPPFiles} "${CPP_FILES}" PARENT_SCOPE )
SET( ${_HFiles} "${H_FILES}" PARENT_SCOPE )
SET( ${_TestFiles} "${TEST_FILES}" PARENT_SCOPE )
......@@ -124,7 +124,7 @@ FUNCTION( SETUP_TESTS _TEST_FILES _TEST_TARGET )
IF( NOT ${ListLength} STREQUAL "0" )
# the list may contain duplicates
LIST( REMOVE_DUPLICATES FixturePaths )
# ---------------------------------------------------------------------------------------------------------------------------------------
# Create copy target for each fixture directory
# ---------------------------------------------------------------------------------------------------------------------------------------
......@@ -164,7 +164,7 @@ FUNCTION( SETUP_SHADERS _Shaders _TargetDir )
STRING( REGEX REPLACE "^.*/" "" StrippedFileName "${fname}" )
# let cmake do it
EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E ${ShaderOperation} ${fname} "${_TargetDir}/${StrippedFileName}" )
EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E ${ShaderOperation} ${fname} "${_TargetDir}/${StrippedFileName}" )
ENDFOREACH( fname )
ENDIF( OW_HANDLE_SHADERS )
ENDFUNCTION( SETUP_SHADERS )
......@@ -184,8 +184,8 @@ FUNCTION( SETUP_STYLECHECKER _TargetName _CheckFiles _Excludes )
ENDIF( IsExcluded )
ENDFOREACH( excludeRule )
ENDFOREACH( filename )
# the stylechecker allows coloring the output. Enable if color make is active
# the stylechecker allows coloring the output. Enable if color make is active
IF( CMAKE_COLOR_MAKEFILE )
SET( STYLECHECK_OPTIONS "--color" )
ELSE()
......
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