Merge "Minor fixes" into cframework/master

1 files changed, 47 insertions, 47 deletions

diff --git a/libparc/CMakeLists.txt b/libparc/CMakeLists.txt
index 871cb1bd..39c83c5c 100644
--- a/libparc/CMakeLists.txt
+++ b/libparc/CMakeLists.txt
@@ -22,18 +22,18 @@ include( version )
 include( detectCacheSize )
 
 if(ANDROID_API)
-    message("############ Detected cross compile for $ENV{CMAKE_SYSTEM_NAME}")
-    message("############ This build will not include doxygen, tools, or tests")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ANDROID_C_FLAGS} -Wall")
+  message("############ Detected cross compile for $ENV{CMAKE_SYSTEM_NAME}")
+  message("############ This build will not include doxygen, tools, or tests")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ANDROID_C_FLAGS} -Wall")
 elseif(COMPILE_FOR_IOS)
-    message("############ Detected cross compile for $ENV{CMAKE_SYSTEM_NAME}")
-    message("############ This build will not include doxygen, tools, or tests")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+  message("############ Detected cross compile for $ENV{CMAKE_SYSTEM_NAME}")
+  message("############ This build will not include doxygen, tools, or tests")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 else()
 #    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 #    set(CMAKE_C_FLAGS_NOPANTS "${CMAKE_C_FLAGS_NOPANTS} -O3 -DNDEBUG -DPARCLibrary_DISABLE_VALIDATION")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-    find_package( Doxygen )
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+  find_package( Doxygen )
 endif()
 
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${CMAKE_C_FLAGS}")
@@ -83,21 +83,21 @@ add_custom_target(${PROJECT_NAME}_cleanup_profiling_data
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Cleanup previous profiling data.")
 if (ANDROID_API)
-    macro(AddTest testFile)
-        message("Android build: Skipping test ${ARGV0}")
-    endmacro(AddTest)
+  macro(AddTest testFile)
+    message("Android build: Skipping test ${ARGV0}")
+  endmacro(AddTest)
 elseif(COMPILE_FOR_IOS)
-	macro(AddTest testFile)
-        message("iOS build: Skipping test ${ARGV0}")
-    endmacro(AddTest)
+  macro(AddTest testFile)
+    message("iOS build: Skipping test ${ARGV0}")
+  endmacro(AddTest)
 else()
-    macro(AddTest testFile)
-     add_executable(${ARGV0} ${ARGV0}.c)
-     target_link_libraries(${ARGV0} ${PARC_BIN_LIBRARIES})
-     add_test(NAME ${ARGV0} COMMAND ${ARGV0})
-     set_target_properties(${ARGV0} PROPERTIES FOLDER Test)
-     add_dependencies(${ARGV0} ${PROJECT_NAME}_cleanup_profiling_data)
-   endmacro(AddTest)
+  macro(AddTest testFile)
+    add_executable(${ARGV0} ${ARGV0}.c)
+    target_link_libraries(${ARGV0} ${PARC_BIN_LIBRARIES})
+    add_test(NAME ${ARGV0} COMMAND ${ARGV0})
+    set_target_properties(${ARGV0} PROPERTIES FOLDER Test)
+    add_dependencies(${ARGV0} ${PROJECT_NAME}_cleanup_profiling_data)
+  endmacro(AddTest)
 endif()
 
 add_subdirectory(parc)
@@ -130,43 +130,43 @@ else()
 endif()
 
 if(DEB_PACKAGE)
-    set(TYPE "DEBIAN")
-    set(GENERATOR "DEB")
+  set(TYPE "DEBIAN")
+  set(GENERATOR "DEB")
 
-    set(CPACK_${TYPE}_LIBRARY_PACKAGE_NAME "${PACKAGE_NAME}")
-    set(CPACK_${TYPE}_HEADERS_PACKAGE_NAME "${PACKAGE_NAME}-dev")
-    set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_NAME "${PACKAGE_NAME}-doc")
+  set(CPACK_${TYPE}_LIBRARY_PACKAGE_NAME "${PACKAGE_NAME}")
+  set(CPACK_${TYPE}_HEADERS_PACKAGE_NAME "${PACKAGE_NAME}-dev")
+  set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_NAME "${PACKAGE_NAME}-doc")
 
-    set(CPACK_${TYPE}_LIBRARY_FILE_NAME "${PACKAGE_NAME}_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
-    set(CPACK_${TYPE}_HEADERS_FILE_NAME "${PACKAGE_NAME}-dev_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
-    set(CPACK_${TYPE}_DOCUMENTATION_FILE_NAME "${PACKAGE_NAME}-doc_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
+  set(CPACK_${TYPE}_LIBRARY_FILE_NAME "${PACKAGE_NAME}_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
+  set(CPACK_${TYPE}_HEADERS_FILE_NAME "${PACKAGE_NAME}-dev_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
+  set(CPACK_${TYPE}_DOCUMENTATION_FILE_NAME "${PACKAGE_NAME}-doc_${PACKAGE_VERSION}_${ARCHITECTURE}.deb")
 
-    set(CPACK_DEBIAN_LIBRARY_PACKAGE_SHLIBDEPS ON)
+  set(CPACK_DEBIAN_LIBRARY_PACKAGE_SHLIBDEPS ON)
 
-    set(CPACK_${TYPE}_LIBRARY_PACKAGE_DEPENDS "longbow (>= 1.0)")
-    set(CPACK_${TYPE}_HEADERS_PACKAGE_DEPENDS "libparc (>= 1.0), longbow-dev (>= 1.0), libevent-dev, libssl-dev")
-    set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_DEPENDS "")
+  set(CPACK_${TYPE}_LIBRARY_PACKAGE_DEPENDS "longbow (>= 1.0)")
+  set(CPACK_${TYPE}_HEADERS_PACKAGE_DEPENDS "libparc (>= 1.0), longbow-dev (>= 1.0), libevent-dev, libssl-dev")
+  set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_DEPENDS "")
 elseif(RPM_PACKAGE)
-    set(TYPE "RPM")
-    set(GENERATOR "RPM")
+  set(TYPE "RPM")
+  set(GENERATOR "RPM")
 
-    set(CPACK_${TYPE}_LIBRARY_PACKAGE_NAME "${PACKAGE_NAME}")
-    set(CPACK_${TYPE}_HEADERS_PACKAGE_NAME "${PACKAGE_NAME}-devel")
-    set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_NAME "${PACKAGE_NAME}-doc")
+  set(CPACK_${TYPE}_LIBRARY_PACKAGE_NAME "${PACKAGE_NAME}")
+  set(CPACK_${TYPE}_HEADERS_PACKAGE_NAME "${PACKAGE_NAME}-devel")
+  set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_NAME "${PACKAGE_NAME}-doc")
 
-    set(CPACK_${TYPE}_LIBRARY_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
-    set(CPACK_${TYPE}_HEADERS_FILE_NAME "${PACKAGE_NAME}-devel-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
-    set(CPACK_${TYPE}_DOCUMENTATION_FILE_NAME "${PACKAGE_NAME}-doc-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
+  set(CPACK_${TYPE}_LIBRARY_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
+  set(CPACK_${TYPE}_HEADERS_FILE_NAME "${PACKAGE_NAME}-devel-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
+  set(CPACK_${TYPE}_DOCUMENTATION_FILE_NAME "${PACKAGE_NAME}-doc-${PACKAGE_VERSION}.${ARCHITECTURE}.rpm")
 
-    set(CPACK_${TYPE}_LIBRARY_PACKAGE_AUTOREQ ON)
+  set(CPACK_${TYPE}_LIBRARY_PACKAGE_AUTOREQ ON)
 
-    set(CPACK_${TYPE}_LIBRARY_PACKAGE_REQUIRES "longbow >= 1.0")
-    set(CPACK_${TYPE}_HEADERS_PACKAGE_REQUIRES "libparc >= 1.0, longbow-devel >= 1.0, libevent-devel, openssl-devel")
-    set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_REQUIRES "")
+  set(CPACK_${TYPE}_LIBRARY_PACKAGE_REQUIRES "longbow >= 1.0")
+  set(CPACK_${TYPE}_HEADERS_PACKAGE_REQUIRES "libparc >= 1.0, longbow-devel >= 1.0, libevent-devel, openssl-devel")
+  set(CPACK_${TYPE}_DOCUMENTATION_PACKAGE_REQUIRES "")
 
-    set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/etc" "/usr/lib/python2.7" "/usr/lib/python2.7/site-packages")
+  set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/etc" "/usr/lib/python2.7" "/usr/lib/python2.7/site-packages")
 else()
-    return()
+  return()
 endif()
 
 set(CPACK_GENERATOR ${GENERATOR})