[CHANGE #84] - file globbing now includes hpp files.

src/CMakeLists.txt

@@ -101,7 +101,7 @@ IF( NOT CMAKE_BUILD_TYPE STREQUAL "Static" )
     TARGET_LINK_LIBRARIES( walnut kernel dataHandler gui guiqt4 common ${Boost_LIBRARIES} )
     
 ELSE( NOT CMAKE_BUILD_TYPE STREQUAL "Static" )
-    FILE( GLOB_RECURSE ALL_SRC ${PROJECT_SOURCE_DIR}/*.cpp )
+    FILE( GLOB_RECURSE ALL_SRC ${PROJECT_SOURCE_DIR}/*.[c,h]pp )
     FILE( GLOB NIFTI_SRC "dataHandler/io/nifti/*.c" )
     ADD_DEFINITIONS( -DHAVE_ZLIB )
 
@@ -162,13 +162,13 @@ ADD_CUSTOM_TARGET( tags DEPENDS ctags DEPENDS cscope )
 # Checks style guide lines via the BrainLint tool against all source code files
 #    The output is colored when variable CMAKE_COLOR_MAKEFILE is set to ON,
 #    noncolored if it is set to OFF
-FILE( GLOB_RECURSE STYLE_CPP ${PROJECT_SOURCE_DIR}/*.cpp )
+FILE( GLOB_RECURSE STYLE_CPP ${PROJECT_SOURCE_DIR}/*.[c,h]pp )
 FILE( GLOB_RECURSE STYLE_H ${PROJECT_SOURCE_DIR}/*.h )
 # Set dirs to exclude from stylecheck
 SET( EXCLUDE_DIRS "/dataHandler/io/nifti/;/dataHandler/io/biosig/;/dataHandler/io/biosig/XMLParser/" )
 FOREACH( dirname ${EXCLUDE_DIRS} )
     FILE( GLOB EXCLUDE_H   ${PROJECT_SOURCE_DIR}${dirname}*.h )
-    FILE( GLOB EXCLUDE_CPP ${PROJECT_SOURCE_DIR}${dirname}*.cpp )
+    FILE( GLOB EXCLUDE_CPP ${PROJECT_SOURCE_DIR}${dirname}*.[c,h]pp )
     
     FOREACH( fname ${EXCLUDE_H} )
         LIST( REMOVE_ITEM STYLE_H ${fname} )

src/common/CMakeLists.txt

-FILE( GLOB COMMON_SRC "*.cpp" "*.hpp" )
+FILE( GLOB COMMON_SRC "*.[c,h]pp" )
 
 ADD_LIBRARY( common SHARED ${COMMON_SRC} )
 TARGET_LINK_LIBRARIES( common ${Boost_LIBRARIES} )

src/dataHandler/CMakeLists.txt

 ADD_SUBDIRECTORY( io )
 ADD_SUBDIRECTORY( exceptions )
 
-FILE( GLOB DATAHANDLER_SRC "*.cpp" "*.hpp" )
-FILE( GLOB DATAHANDLER_EXCEPTIONS_SRC "exceptions/*.cpp" )
-FILE( GLOB DATAHANDLER_LOADERS_SRC "io/WLoader*.cpp" )
+FILE( GLOB DATAHANDLER_SRC "*.[c,h]pp" )
+FILE( GLOB DATAHANDLER_EXCEPTIONS_SRC "exceptions/*.[c,h]pp" )
+FILE( GLOB DATAHANDLER_LOADERS_SRC "io/WLoader*.[c,h]pp" )
 
 ADD_LIBRARY( dataHandler SHARED ${DATAHANDLER_SRC} ${DATAHANDLER_EXCEPTIONS_SRC} ${DATAHANDLER_LOADERS_SRC} )
 TARGET_LINK_LIBRARIES( dataHandler common math ${Boost_LIBRARIES} niftiio biosig)

src/dataHandler/io/CMakeLists.txt

@@ -3,7 +3,7 @@ ADD_SUBDIRECTORY( test )
 ADD_SUBDIRECTORY( nifti )
 ADD_SUBDIRECTORY( biosig )
 
-FILE( GLOB DATAHANDLER_LOADERS_SRC "WLoader*.cpp" "*.hpp" )
+FILE( GLOB DATAHANDLER_LOADERS_SRC "WLoader*.[c,h]pp" )
 
 # Unit tests
 IF( CXXTEST_FOUND )

src/graphicsEngine/CMakeLists.txt

 # Package dependencies:
 ADD_SUBDIRECTORY( exceptions )
 
-FILE( GLOB GE_EXCEPTIONS_SRC "exceptions/*.cpp" )
-FILE( GLOB GE_SRC "*.cpp" )
+FILE( GLOB GE_EXCEPTIONS_SRC "exceptions/*.[c,h]pp" )
+FILE( GLOB GE_SRC "*.[c,h]pp" )
 
 ADD_LIBRARY( ge SHARED ${GE_SRC} ${GE_EXCEPTIONS_SRC} )
 TARGET_LINK_LIBRARIES( ge common ${OPENGL_gl_LIBRARY} ${OPENSCENEGRAPH_LIBRARIES} )

src/gui/CMakeLists.txt

 ADD_SUBDIRECTORY( qt4 )
 
-FILE( GLOB GUI_SRC "*.cpp" )
+FILE( GLOB GUI_SRC "*.[c,h]pp" )
 
 ADD_LIBRARY( gui SHARED ${GUI_SRC} )
 TARGET_LINK_LIBRARIES( gui common )

src/gui/qt4/CMakeLists.txt

@@ -16,7 +16,7 @@ SET(GUI_QT4_MOC_HDRS
 
 QT4_WRAP_CPP(GUI_QT4_MOC_SRCS ${GUI_QT4_MOC_HDRS} )
 
-FILE(GLOB GUI_QT4_SRC "*.cpp")
+FILE(GLOB GUI_QT4_SRC "*.[c,h]pp")
 
 ADD_LIBRARY( guiqt4 SHARED ${GUI_QT4_SRC} ${GUI_QT4_MOC_SRCS} )
 

src/kernel/CMakeLists.txt

-FILE( GLOB KERNEL_SRC "*.cpp" "*.hpp" )
-FILE( GLOB_RECURSE MODULES_SRC "../modules/*.cpp" )
+FILE( GLOB KERNEL_SRC "*.[c,h]pp" )
+
+FILE( GLOB_RECURSE MODULES_SRC "../modules/*.[c,h]pp" )
 
 ADD_SUBDIRECTORY( exceptions )
-FILE( GLOB KERNEL_EXCEPTIONS_SRC "exceptions/*.cpp" )
+FILE( GLOB KERNEL_EXCEPTIONS_SRC "exceptions/*.[c,h]pp" )
 
 ADD_LIBRARY( kernel SHARED ${KERNEL_SRC} ${MODULES_SRC} ${KERNEL_EXCEPTIONS_SRC} )
 TARGET_LINK_LIBRARIES( kernel common dataHandler ge math ${OPENSCENEGRAPH_LIBRARIES} )

src/math/CMakeLists.txt

-FILE( GLOB MATH_SRC "*.cpp" "*.hpp" )
+FILE( GLOB MATH_SRC "*.[c,h]pp" )
 
 ADD_LIBRARY( math SHARED ${MATH_SRC} )
 

src/utils/CMakeLists.txt

-FILE(GLOB UTILS_SRC "*.cpp")
+FILE(GLOB UTILS_SRC "*.[c,h]pp")
 
 ADD_LIBRARY( utils SHARED ${UTILS_SRC} )
 TARGET_LINK_LIBRARIES( utils ${Boost_PROGRAM_OPTIONS_LIBRARY} guiqt4)