STYLE: Clean some comments, spaces, tabs

libnifalcon · May 11, 2016 · 68862e3 · 68862e3
1 parent 9bb0bf9
commit 68862e3
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 106 deletions.
diff --git a/BuildSysCMakeLib.cmake b/BuildSysCMakeLib.cmake
@@ -271,11 +271,11 @@ FUNCTION(BUILDSYS_BUILD_LIB)
 
     # This allows use to build static/shared libraries of the same name.
     # See http://www.itk.org/Wiki/CMake_FAQ#How_do_I_make_my_shared_and_static_libraries_have_the_same_root_name.2C_but_different_suffixes.3F
-	IF(USE_STATIC_SUFFIX AND LIB_TYPE STREQUAL "STATIC")
+	  IF(USE_STATIC_SUFFIX AND LIB_TYPE STREQUAL "STATIC")
       SET_TARGET_PROPERTIES (${CURRENT_LIB} PROPERTIES OUTPUT_NAME ${BUILDSYS_LIB_NAME}_s)
-	ELSE()
+	  ELSE()
       SET_TARGET_PROPERTIES (${CURRENT_LIB} PROPERTIES OUTPUT_NAME ${BUILDSYS_LIB_NAME})	  
-	ENDIF()
+	  ENDIF()
     SET_TARGET_PROPERTIES (${CURRENT_LIB} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 
     # Add version, if we're given one
@@ -300,7 +300,7 @@ FUNCTION(BUILDSYS_BUILD_LIB)
 
     # Libraries we should link again
     IF(BUILDSYS_LIB_LINK_LIBS)
-	  TARGET_LINK_LIBRARIES(${CURRENT_LIB} ${BUILDSYS_LIB_LINK_LIBS})
+	    TARGET_LINK_LIBRARIES(${CURRENT_LIB} ${BUILDSYS_LIB_LINK_LIBS})
     ENDIF()
 
     # Defines and compiler flags, if any
@@ -447,12 +447,12 @@ FUNCTION(BUILDSYS_BUILD_EXE)
     INSTALL(FILES ${EXE_OUTPUT_NAME} RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR} OPTIONAL)
   ENDIF()
 
-
   # If the executable depends on anything, set up dependency
   IF(BUILDSYS_EXE_DEPENDS)
     ADD_DEPENDENCIES(${BUILDSYS_EXE_NAME} ${BUILDSYS_EXE_DEPENDS})
   ENDIF()
 
+  # If the executable is part of a group, add it to it
   IF(BUILDSYS_EXE_GROUP)
     IF(NOT TARGET ${BUILDSYS_EXE_GROUP})
       MESSAGE(STATUS "Creating build group ${BUILDSYS_EXE_GROUP}")

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,15 +18,13 @@ ENDIF(COMMAND cmake_policy)
 ######################################################################################
 
 #Project declaration
-
 PROJECT(LIBNIFALCON)
 INITIALIZE_BUILD()
 
 #Common Options
-
 OPTION_LIBRARY_BUILD_STATIC(ON)
-#We can't build shared on MSVC yet
 IF(NOT MSVC)
+  #We can't build shared on MSVC yet
   OPTION_LIBRARY_BUILD_SHARED(ON)
 ENDIF(NOT MSVC)
 OPTION_GPROF(OFF)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -2,19 +2,19 @@
 # Build function for examples
 ######################################################################################
 
-SET(LIBNIFALCON_EXE_PO_LINK_LIBS ${LIBNIFALCON_EXE_LINK_LIBS} nifalcon_cli_base)
+set(LIBNIFALCON_EXE_PO_LINK_LIBS ${LIBNIFALCON_EXE_LINK_LIBS} nifalcon_cli_base)
 
 ######################################################################################
 # Build function for barrow_mechanics
 ######################################################################################
 
-SET(SRCS barrow_mechanics/main.cpp)
+set(SRCS barrow_mechanics/main.cpp)
 
 BUILDSYS_BUILD_EXE(
   NAME barrow_mechanics
-  SOURCES "${SRCS}" 
-  CXX_FLAGS "${DEFINE}" 
-  LINK_LIBS "${LIBNIFALCON_EXE_LINK_LIBS}" 
+  SOURCES ${SRCS}
+  CXX_FLAGS ${DEFINE}
+  LINK_LIBS ${LIBNIFALCON_EXE_LINK_LIBS}
   LINK_FLAGS FALSE 
   DEPENDS nifalcon
   SHOULD_INSTALL TRUE
@@ -24,15 +24,15 @@ BUILDSYS_BUILD_EXE(
 # Build function for findfalcons
 ######################################################################################
 
-SET(SRCS 
+set(SRCS 
   findfalcons/findfalcons.cpp
   )
 
 BUILDSYS_BUILD_EXE(
   NAME findfalcons
-  SOURCES "${SRCS}" 
-  CXX_FLAGS "${DEFINE}" 
-  LINK_LIBS "${LIBNIFALCON_EXE_LINK_LIBS}" 
+  SOURCES ${SRCS} 
+  CXX_FLAGS ${DEFINE}
+  LINK_LIBS ${LIBNIFALCON_EXE_LINK_LIBS}
   LINK_FLAGS FALSE 
   DEPENDS nifalcon
   SHOULD_INSTALL TRUE
@@ -42,15 +42,15 @@ BUILDSYS_BUILD_EXE(
 # Build function for findfalcons_multi
 ######################################################################################
 
-SET(SRCS 
+set(SRCS 
   findfalcons_multi/findfalcons_multi.cpp
   )
 
 BUILDSYS_BUILD_EXE(
   NAME findfalcons_multi
-  SOURCES "${SRCS}" 
-  CXX_FLAGS "${DEFINE}" 
-  LINK_LIBS "${LIBNIFALCON_EXE_LINK_LIBS}" 
+  SOURCES ${SRCS}
+  CXX_FLAGS ${DEFINE}
+  LINK_LIBS ${LIBNIFALCON_EXE_LINK_LIBS}
   LINK_FLAGS FALSE 
   DEPENDS nifalcon
   SHOULD_INSTALL TRUE
@@ -60,15 +60,15 @@ BUILDSYS_BUILD_EXE(
 # Build function for falcon_led
 ######################################################################################
 
-SET(SRCS
+set(SRCS
   falcon_led/falcon_led.cpp
 )
 
 BUILDSYS_BUILD_EXE(
     NAME falcon_led
-    SOURCES "${SRCS}" 
+    SOURCES ${SRCS}
     CXX_FLAGS FALSE
-    LINK_LIBS "${LIBNIFALCON_EXE_PO_LINK_LIBS}" 
+    LINK_LIBS ${LIBNIFALCON_EXE_PO_LINK_LIBS}
     LINK_FLAGS FALSE 
     DEPENDS nifalcon_cli_base
     SHOULD_INSTALL TRUE
@@ -79,7 +79,7 @@ BUILDSYS_BUILD_EXE(
 # Build function for falcon_test_cli
 ######################################################################################
 
-SET(SRCS
+set(SRCS
     falcon_test_cli/falcon_test_cli.cpp 
     falcon_test_cli/FalconTestBase.cpp 
     falcon_test_cli/FalconLoopTimeTest.cpp 
@@ -91,9 +91,9 @@ SET(SRCS
 
 BUILDSYS_BUILD_EXE(
     NAME falcon_test_cli
-    SOURCES "${SRCS}" 
+    SOURCES ${SRCS}
     CXX_FLAGS FALSE
-    LINK_LIBS "${LIBNIFALCON_EXE_PO_LINK_LIBS}" 
+    LINK_LIBS ${LIBNIFALCON_EXE_PO_LINK_LIBS}
     LINK_FLAGS FALSE 
     DEPENDS nifalcon_cli_base
     SHOULD_INSTALL TRUE
@@ -103,32 +103,31 @@ BUILDSYS_BUILD_EXE(
 # Build function for falcon_mouse
 ######################################################################################
 
-  IF(WIN32)
-	SET(MOUSE_SRCS falcon_mouse/falcon_mouse.cpp falcon_mouse/falcon_mouse_win.cpp)
-	SET(MOUSE_LINK_LIBS ${LIBNIFALCON_EXE_PO_LINK_LIBS})
-  ELSEIF(APPLE)
-	SET(MOUSE_SRCS falcon_mouse/falcon_mouse.cpp falcon_mouse/falcon_mouse_osx.cpp)
-	SET(MOUSE_LINK_LIBS ${LIBNIFALCON_EXE_PO_LINK_LIBS})
-	SET(MOUSE_LINK_FLAGS "-framework Carbon -framework ApplicationServices")
-  ELSEIF(UNIX)
-	FIND_PACKAGE(X11)
-	IF(X11_FOUND AND X11_XTest_LIB)
-	  INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
-	  SET(MOUSE_SRCS falcon_mouse/falcon_mouse.cpp falcon_mouse/falcon_mouse_x11.cpp)      
-	  SET(MOUSE_LINK_LIBS ${LIBNIFALCON_EXE_PO_LINK_LIBS} ${X11_LIBRARIES} ${X11_XTest_LIB}) 
-	ELSE(X11_FOUND AND X11_XTest_LIB)
-	  MESSAGE(STATUS "Not compiling falcon_mouse example - X11 compiling requires the XTest library")
-	ENDIF(X11_FOUND AND X11_XTest_LIB)
-  ENDIF(WIN32)
-  IF(MOUSE_SRCS)
-	BUILDSYS_BUILD_EXE(
-      NAME falcon_mouse
-      SOURCES "${MOUSE_SRCS}" 
-      LINK_LIBS "${MOUSE_LINK_LIBS}" 
-      LINK_FLAGS "${MOUSE_LINK_FLAGS}" 
-      CXX_FLAGS FALSE
-	  )
-  ENDIF(MOUSE_SRCS)
+  if(WIN32)
+	  set(MOUSE_SRCS falcon_mouse/falcon_mouse.cpp falcon_mouse/falcon_mouse_win.cpp)
+	  set(MOUSE_LINK_LIBS ${LIBNIFALCON_EXE_PO_LINK_LIBS})
+  elseif(APPLE)
+	  set(MOUSE_SRCS falcon_mouse/falcon_mouse.cpp falcon_mouse/falcon_mouse_osx.cpp)
+	  set(MOUSE_LINK_LIBS ${LIBNIFALCON_EXE_PO_LINK_LIBS})
+	  set(MOUSE_LINK_FLAGS "-framework Carbon -framework ApplicationServices")
+  elseif(UNIX)
+	  find_package(X11)
+	  if(X11_FOUND AND X11_XTest_LIB)
+	    include_directories(${X11_INCLUDE_DIR})
+	    set(MOUSE_SRCS falcon_mouse/falcon_mouse.cpp falcon_mouse/falcon_mouse_x11.cpp)      
+	    set(MOUSE_LINK_LIBS ${LIBNIFALCON_EXE_PO_LINK_LIBS} ${X11_LIBRARIES} ${X11_XTest_LIB}) 
+	  else(X11_FOUND AND X11_XTest_LIB)
+	    message(STATUS "Not compiling falcon_mouse example - X11 compiling requires the XTest library")
+	  endif()
+  endif()
+
+  if(MOUSE_SRCS)
+    BUILDSYS_BUILD_EXE(
+        NAME falcon_mouse
+        SOURCES ${MOUSE_SRCS}
+        LINK_LIBS ${MOUSE_LINK_LIBS}
+        LINK_FLAGS ${MOUSE_LINK_FLAGS}
+        CXX_FLAGS FALSE
         DEPENDS nifalcon
         SHOULD_INSTALL TRUE
       )

diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -2,7 +2,12 @@
 # Installation of headers
 ######################################################################################
 
-SET(LIBNIFALCON_INCLUDE_DIRS
+######################################################################################
+# MAIN INCLUDES
+######################################################################################
+
+# Set list
+set(LIBNIFALCON_INCLUDE_DIRS
   ${CMAKE_CURRENT_SOURCE_DIR}/falcon/gmtl 
   ${CMAKE_CURRENT_SOURCE_DIR}/falcon/cpp-optparse
   ${CMAKE_CURRENT_SOURCE_DIR}/falcon/core
@@ -11,32 +16,38 @@ SET(LIBNIFALCON_INCLUDE_DIRS
   ${CMAKE_CURRENT_SOURCE_DIR}/falcon/grip
 )
 
-INSTALL(DIRECTORY 
-  ${LIBNIFALCON_INCLUDE_DIRS}
-  DESTINATION ${INCLUDE_INSTALL_DIR}/falcon
-  )
+# Append LIBNIFALCON_INCLUDE_FILES
+foreach(DIR ${LIBNIFALCON_INCLUDE_DIRS})
+  file(GLOB_RECURSE HEADER_FILES ${DIR}/*.h)
+  list(APPEND LIBNIFALCON_INCLUDE_FILES ${HEADER_FILES})
+endforeach()
+set(LIBNIFALCON_INCLUDE_FILES ${LIBNIFALCON_INCLUDE_FILES} PARENT_SCOPE)
 
-INSTALL(FILES
+# Install
+install(DIRECTORY ${LIBNIFALCON_INCLUDE_DIRS} DESTINATION ${INCLUDE_INSTALL_DIR}/falcon)
+
+######################################################################################
+# UTILITY INCLUDES
+######################################################################################
+
+# Set list
+SET(LIBNIFALCON_UTIL_INCLUDES
   ${CMAKE_CURRENT_SOURCE_DIR}/falcon/util/FalconFirmwareBinaryTest.h
   ${CMAKE_CURRENT_SOURCE_DIR}/falcon/util/FalconFirmwareBinaryNvent.h
   ${CMAKE_CURRENT_SOURCE_DIR}/falcon/util/FalconDeviceThread.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/falcon/util
-)
-
-FOREACH(DIR ${LIBNIFALCON_INCLUDE_DIRS})
-  FILE(GLOB_RECURSE HEADER_FILES ${DIR}/*.h)
-  LIST(APPEND LIBNIFALCON_INCLUDE_FILES ${HEADER_FILES})
-ENDFOREACH(DIR ${LIBNIFALCON_INCLUDE_DIRS})
-#Headers for comm or util library specific development
+  )
 
-SET(LIBNIFALCON_INCLUDE_FILES ${LIBNIFALCON_INCLUDE_FILES} PARENT_SCOPE)
+# Install
+install(FILES ${LIBNIFALCON_UTIL_INCLUDES} DESTINATION ${INCLUDE_INSTALL_DIR}/falcon/util)
 
-#Only install one of the comm headers
-IF(LIBUSB_1_FOUND)
-  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/falcon/comm/FalconCommLibUSB.h DESTINATION ${INCLUDE_INSTALL_DIR}/falcon/comm)
-ELSEIF(LIBFTD2XX_FOUND)
-  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/falcon/comm/FalconCommFTD2XX.h DESTINATION ${INCLUDE_INSTALL_DIR}/falcon/comm)
-ENDIF(LIBUSB_1_FOUND)
+######################################################################################
+# COMM INCLUDES
+######################################################################################
 
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/falcon/util/FalconCLIBase.h DESTINATION ${INCLUDE_INSTALL_DIR}/falcon/util)
+if(LIBUSB1_FOUND)
+  set(FALCON_COMM_INCLUDE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/falcon/comm/FalconCommLibUSB.h)
+elseif(LIBFTD2XX_FOUND)
+  set(FALCON_COMM_INCLUDE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/falcon/comm/FalconCommFTD2XX.h)
+endif()
 
+install(FILES ${FALCON_COMM_INCLUDE_FILE} DESTINATION ${INCLUDE_INSTALL_DIR}/falcon/comm)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Build function for main library
 ######################################################################################
 
-SET(LIBRARY_SRCS 
+set(LIBNIFALCON_LIBRARY_SRCS
   ${LIBNIFALCON_INCLUDE_FILES}
   core/FalconDevice.cpp 
   core/FalconFirmware.cpp 
@@ -11,33 +11,33 @@ SET(LIBRARY_SRCS
   cpp-optparse/OptionParser.cpp)
 
 if(LIBUSB1_FOUND)
-  list(APPEND LIBRARY_SRCS
+  list(APPEND LIBNIFALCON_LIBRARY_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/comm/FalconCommLibUSB.cpp
-	  ${LIBNIFALCON_INCLUDE_DIR}/falcon/comm/FalconCommLibUSB.h
-	  )
+    ${LIBNIFALCON_INCLUDE_DIR}/falcon/comm/FalconCommLibUSB.h
+    )
   set(LIBNIFALCON_DEVICE_DEFINES -DLIBNIFALCON_USE_LIBUSB1)
 elseif(LIBFTD2XX_FOUND)
-  list(APPEND LIBRARY_SRCS
-	  ${CMAKE_CURRENT_SOURCE_DIR}/comm/FalconCommFTD2XX.cpp
-	  ${LIBNIFALCON_INCLUDE_DIR}/falcon/comm/FalconCommFTD2XX.h
-	  )
+  list(APPEND LIBNIFALCON_LIBRARY_SRCS
+    ${CMAKE_CURRENT_SOURCE_DIR}/comm/FalconCommFTD2XX.cpp
+    ${LIBNIFALCON_INCLUDE_DIR}/falcon/comm/FalconCommFTD2XX.h
+    )
   set(LIBNIFALCON_DEVICE_DEFINES -DLIBNIFALCON_USE_LIBFTD2XX)
 endif()
 
 BUILDSYS_BUILD_LIB(
   NAME nifalcon
-  SOURCES "${LIBRARY_SRCS}" 
-  CXX_FLAGS "${LIBNIFALCON_DEVICE_DEFINES}"
-  LINK_LIBS "${LIBNIFALCON_REQ_LIBS}"
+  SOURCES ${LIBNIFALCON_LIBRARY_SRCS}
+  CXX_FLAGS ${LIBNIFALCON_DEVICE_DEFINES}
+  LINK_LIBS ${LIBNIFALCON_REQ_LIBS}
   LINK_FLAGS FALSE 
   DEPENDS FALSE
   SHOULD_INSTALL TRUE
-  VERSION "${LIBNIFALCON_VERSION}"
+  VERSION ${LIBNIFALCON_VERSION}
   )
 
-ADD_SUBDIRECTORY(util)
+add_subdirectory(util)
 
-SET(SRC_GROUPS
+set(SRC_GROUPS
   Core
   Kinematic
   GMTL
@@ -46,9 +46,8 @@ SET(SRC_GROUPS
   Firmware
   Util
 )
-
-FOREACH(GROUP ${SRC_GROUPS})
-  STRING(TOLOWER ${GROUP} LOWER_GROUP)
-  SOURCE_GROUP(${GROUP} REGULAR_EXPRESSION "${LOWER_GROUP}")
-ENDFOREACH(GROUP ${SRC_GROUPS})
+foreach(GROUP ${SRC_GROUPS})
+  string(TOLOWER ${GROUP} LOWER_GROUP)
+  source_group(${GROUP} REGULAR_EXPRESSION "${LOWER_GROUP}")
+endforeach(GROUP ${SRC_GROUPS})