[Orxonox-commit 953] r5676 - in code/branches/resource3: cmake src/network src/network/packet src/network/synchronisable src/util
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Aug 24 13:57:27 CEST 2009
Author: rgrieder
Date: 2009-08-24 13:57:27 +0200 (Mon, 24 Aug 2009)
New Revision: 5676
Modified:
code/branches/resource3/cmake/ParseMacroArguments.cmake
code/branches/resource3/src/network/CMakeLists.txt
code/branches/resource3/src/network/packet/CMakeLists.txt
code/branches/resource3/src/network/synchronisable/CMakeLists.txt
code/branches/resource3/src/util/CMakeLists.txt
Log:
Merged revision 5610 to resource3:
Improved CMake performance for runs after the first one.
There are some optimisations in the macro argument parser and I manually added the header files for util and network (since they don't change too much and it still compiles with a missing header files).
Modified: code/branches/resource3/cmake/ParseMacroArguments.cmake
===================================================================
--- code/branches/resource3/cmake/ParseMacroArguments.cmake 2009-08-24 11:54:37 UTC (rev 5675)
+++ code/branches/resource3/cmake/ParseMacroArguments.cmake 2009-08-24 11:57:27 UTC (rev 5676)
@@ -35,42 +35,52 @@
#
MACRO(PARSE_MACRO_ARGUMENTS _switches _list_names)
+
+ # Using LIST(FIND ...) speeds up the process
+ SET(_keywords ${_switches} ${_list_names})
+
# Parse all the arguments and set the corresponding variable
# If the option is just a switch, set the variable to its name for later use
FOREACH(_arg ${ARGN})
- SET(_arg_found FALSE)
- # Switches
- FOREACH(_switch ${_switches})
- IF(${_switch} STREQUAL ${_arg})
- SET(_arg_${_switch} ${_switch})
- SET(_arg_found TRUE)
- # Avoid interpreting arguments after this one as options args for the previous one
- SET(_storage_var)
- BREAK()
- ENDIF()
- ENDFOREACH(_switch)
+ # Is the argument a keyword?
+ LIST(FIND _keywords ${_arg} _keyword_index)
+ IF(NOT _keyword_index EQUAL -1)
- # Input options
- IF(NOT _arg_found)
- FOREACH(_list_name ${_list_names})
- IF(${_list_name} STREQUAL ${_arg})
- SET(_storage_var _arg_${_list_name})
- SET(_arg_found TRUE)
+ # Another optimisation
+ SET(_arg_found FALSE)
+ # Switches
+ FOREACH(_switch ${_switches})
+ IF(${_switch} STREQUAL ${_arg})
+ SET(_arg_${_switch} ${_switch})
+ SET(_arg_found TRUE)
+ # Avoid interpreting arguments after this one as options args for the previous one
+ SET(_storage_var)
BREAK()
ENDIF()
- ENDFOREACH(_list_name)
- ENDIF(NOT _arg_found)
+ ENDFOREACH(_switch)
- # Arguments of an input option (like source files for SOURCE_FILES)
- IF(NOT _arg_found)
+ # Input options
+ IF(NOT _arg_found)
+ FOREACH(_list_name ${_list_names})
+ IF(${_list_name} STREQUAL ${_arg})
+ SET(_storage_var _arg_${_list_name})
+ BREAK()
+ ENDIF()
+ ENDFOREACH(_list_name)
+ ENDIF(NOT _arg_found)
+
+ ELSE()
+
+ # Arguments of an input option (like source files for SOURCE_FILES)
IF(_storage_var)
# Store in variable define above in the foreach loop
SET(${_storage_var} ${${_storage_var}} ${_arg})
ELSE()
MESSAGE(FATAL_ERROR "ORXONOX_ADD_${_target_type} was given a non compliant argument: ${_arg}")
ENDIF(_storage_var)
- ENDIF(NOT _arg_found)
+ ENDIF()
+
ENDFOREACH(_arg)
ENDMACRO(PARSE_MACRO_ARGUMENTS)
Modified: code/branches/resource3/src/network/CMakeLists.txt
===================================================================
--- code/branches/resource3/src/network/CMakeLists.txt 2009-08-24 11:54:37 UTC (rev 5675)
+++ code/branches/resource3/src/network/CMakeLists.txt 2009-08-24 11:57:27 UTC (rev 5676)
@@ -34,11 +34,31 @@
ServerConnection.cc
TrafficControl.cc
)
+
+SET_SOURCE_FILES(NETWORK_HDR_FILES
+ ChatListener.h
+ Client.h
+ ClientConnection.h
+ ClientConnectionListener.h
+ ClientInformation.h
+ Connection.h
+ FunctionCallManager.h
+ GamestateClient.h
+ GamestateHandler.h
+ GamestateManager.h
+ Host.h
+ NetworkFunction.h
+ NetworkPrecompiledHeaders.h
+ NetworkPrereqs.h
+ Server.h
+ ServerConnection.h
+ TrafficControl.h
+)
+
ADD_SUBDIRECTORY(packet)
ADD_SUBDIRECTORY(synchronisable)
ORXONOX_ADD_LIBRARY(network
- FIND_HEADER_FILES
DEFINE_SYMBOL
"NETWORK_SHARED_BUILD"
PCH_FILE
@@ -50,5 +70,5 @@
util
core
SOURCE_FILES
- ${NETWORK_SRC_FILES}
+ ${NETWORK_SRC_FILES} ${NETWORK_HDR_FILES}
)
Modified: code/branches/resource3/src/network/packet/CMakeLists.txt
===================================================================
--- code/branches/resource3/src/network/packet/CMakeLists.txt 2009-08-24 11:54:37 UTC (rev 5675)
+++ code/branches/resource3/src/network/packet/CMakeLists.txt 2009-08-24 11:57:27 UTC (rev 5676)
@@ -1,5 +1,4 @@
ADD_SOURCE_FILES(NETWORK_SRC_FILES
- Packet.cc
Acknowledgement.cc
Chat.cc
ClassID.cc
@@ -7,5 +6,19 @@
FunctionIDs.cc
FunctionCalls.cc
Gamestate.cc
+ Packet.cc
Welcome.cc
)
+
+ADD_SOURCE_FILES(NETWORK_HDR_FILES
+ Acknowledgement.h
+ Chat.cc
+ Chat.h
+ ClassID.h
+ DeleteObjects.h
+ FunctionCalls.h
+ FunctionIDs.h
+ Gamestate.h
+ Packet.h
+ Welcome.h
+)
Modified: code/branches/resource3/src/network/synchronisable/CMakeLists.txt
===================================================================
--- code/branches/resource3/src/network/synchronisable/CMakeLists.txt 2009-08-24 11:54:37 UTC (rev 5675)
+++ code/branches/resource3/src/network/synchronisable/CMakeLists.txt 2009-08-24 11:57:27 UTC (rev 5676)
@@ -4,3 +4,10 @@
SynchronisableSpecialisations.cc
SynchronisableVariable.cc
)
+
+ADD_SOURCE_FILES(NETWORK_HDR_FILES
+ NetworkCallback.h
+ NetworkCallbackManager.h
+ Synchronisable.h
+ SynchronisableVariable.h
+)
Modified: code/branches/resource3/src/util/CMakeLists.txt
===================================================================
--- code/branches/resource3/src/util/CMakeLists.txt 2009-08-24 11:54:37 UTC (rev 5675)
+++ code/branches/resource3/src/util/CMakeLists.txt 2009-08-24 11:57:27 UTC (rev 5676)
@@ -32,17 +32,47 @@
SubString.cc
)
+SET_SOURCE_FILES(UTIL_HDR_FILES
+ CRC32.h
+ Clipboard.h
+ Convert.h
+ Debug.h
+ Exception.h
+ ExprParser.h
+ Math.h
+ MathConvert.h
+ mbool.h
+ MultiType.h
+ MultiTypeValue.h
+ OgreForwardRefs.h
+ OrxAssert.h
+ OrxEnum.h
+ OutputBuffer.h
+ OutputHandler.h
+ RefToValue.h
+ ScopeGuard.h
+ Serialise.h
+ SignalHandler.h
+ Singleton.h
+ Sleep.h
+ StringUtils.h
+ SubString.h
+ TemplateUtils.h
+ TypeTraits.h
+ UTFStringConversions.h
+ UtilPrereqs.h
+)
+
IF(GCC_NO_SYSTEM_HEADER_SUPPORT)
# Get around displaying a few hundred lines of warning code
SET_SOURCE_FILES_PROPERTIES(MultiType.cc PROPERTIES COMPILE_FLAGS "-w")
ENDIF()
ORXONOX_ADD_LIBRARY(util
- FIND_HEADER_FILES
DEFINE_SYMBOL
"UTIL_SHARED_BUILD"
LINK_LIBRARIES
${OGRE_LIBRARY}
SOURCE_FILES
- ${UTIL_SRC_FILES}
+ ${UTIL_SRC_FILES} ${UTIL_HDR_FILES}
)
More information about the Orxonox-commit
mailing list