Changeset 12060 for CMakeLists.txt

Timestamp:

Jun 19, 2013, 11:05:49 AM (12 years ago)

Author:

hock@…

Message:

Reintegrate branch: 20130111-hock-message_classes

improvements:

• new message classes (reboost, zero-copy)
• "fast path" for direct links (skip overlay layer)
• link-properties accessible from the application
• SystemQueue can call boost::bind functions
• protlib compatibility removed (32bit overhead saved in every message)
• addressing2
• AddressDiscovery discoveres only addresses on which we're actually listening
• ariba serialization usage reduced (sill used in OverlayMsg)
• Node::connect, easier and cleaner interface to start-up ariba from the application
• ariba configs via JSON, XML, etc (boost::property_tree)
• keep-alive overhead greatly reduced
• (relayed) overlay links can actually be closed now
• lost messages are detected in most cases
• notification to the application when link is transformed into direct-link
• overlay routing: send message to second best hop if it would be dropped otherwise
• SequenceNumbers (only mechanisms, so for: upward compatibility)
• various small fixes

regressions:

• bluetooth is not yet working again
• bootstrap modules deactivated
• liblog4xx is not working (use cout-logging)

This patch brings great performance and stability improvements at cost of backward compatibility.
Also bluetooth and the bootstrap modules have not been ported to the new interfaces, yet.

File:

• CMakeLists.txt (modified) (2 diffs)

CMakeLists.txt

@@ -43 +43 @@
 set(ariba_VERSION_MAJOR 0)
 set(ariba_VERSION_MINOR 8)
-set(ariba_VERSION_PATCH 2)
+set(ariba_VERSION_PATCH 99)
 set(ariba_VERSION ${ariba_VERSION_MAJOR}.${ariba_VERSION_MINOR}.${ariba_VERSION_PATCH})
 
@@ -51 +51 @@
 list(APPEND CMAKE_MODULE_PATH "${ariba_SOURCE_DIR}/CMakeModules")
 
-# Provide some choices for CMAKE_BUILD_TYPE
-set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-    "" Release Debug RelWithDebInfo MinSizeRel)
+
+## Add build type: Profiling ##
+SET( CMAKE_CXX_FLAGS_PROFILING "-O2 -g -pg" CACHE STRING
+    "Flags used by the C++ compiler during profiling builds."
+    FORCE )
+SET( CMAKE_C_FLAGS_PROFILING "-O2 -g -pg" CACHE STRING
+    "Flags used by the C compiler during profiling builds."
+    FORCE )
+SET( CMAKE_EXE_LINKER_FLAGS_PROFILING
+    "" CACHE STRING
+    "Flags used for linking binaries during profiling builds."
+    FORCE )
+SET( CMAKE_SHARED_LINKER_FLAGS_PROFILING
+    "" CACHE STRING
+    "Flags used by the shared libraries linker during profiling builds."
+    FORCE )
+MARK_AS_ADVANCED(
+    CMAKE_CXX_FLAGS_PROFILING
+    CMAKE_C_FLAGS_PROFILING
+    CMAKE_EXE_LINKER_FLAGS_PROFILING
+    CMAKE_SHARED_LINKER_FLAGS_PROFILING )
+# Update the documentation string of CMAKE_BUILD_TYPE for GUIs
+#SET( CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
+#    "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel Profiling."
+#    FORCE )
+## [Add build type: Profiling] ##
+
+## set default build type
+IF(NOT CMAKE_BUILD_TYPE)
+   SET(CMAKE_BUILD_TYPE Release
+       CACHE STRING "Choose the type of build : None Debug Release RelWithDebInfo MinSizeRel Profiling."
+       FORCE)
+ENDIF(NOT CMAKE_BUILD_TYPE)
+message("---> Current build type is: ${CMAKE_BUILD_TYPE}")
+
+
+
+
+## Provide some choices for CMAKE_BUILD_TYPE
+#set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+#    "" Release Debug RelWithDebInfo MinSizeRel)
 
 # Explicitly add BUILD_SHARED_LIBS to the user interface and default to on