[Orxonox-commit 2445] r7152 - in code/branches/presentation3: cmake/tools src/external/ceguilua src/external/tinyxml src/external/tolua src/libraries/core src/orxonox
rgrieder at orxonox.net
rgrieder at orxonox.net
Wed Jun 23 19:00:18 CEST 2010
Author: rgrieder
Date: 2010-06-23 19:00:18 +0200 (Wed, 23 Jun 2010)
New Revision: 7152
Modified:
code/branches/presentation3/cmake/tools/GenerateToluaBindings.cmake
code/branches/presentation3/src/external/ceguilua/CMakeLists.txt
code/branches/presentation3/src/external/tinyxml/CMakeLists.txt
code/branches/presentation3/src/external/tolua/CMakeLists.txt
code/branches/presentation3/src/libraries/core/CMakeLists.txt
code/branches/presentation3/src/orxonox/CMakeLists.txt
Log:
Removed "++" signs from CMake variables and targets names. This only concerns tolua++ and tinyxml++.
Modified: code/branches/presentation3/cmake/tools/GenerateToluaBindings.cmake
===================================================================
--- code/branches/presentation3/cmake/tools/GenerateToluaBindings.cmake 2010-06-23 16:32:14 UTC (rev 7151)
+++ code/branches/presentation3/cmake/tools/GenerateToluaBindings.cmake 2010-06-23 17:00:18 UTC (rev 7152)
@@ -65,12 +65,12 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${_tolua_cxxfile} ${_tolua_hfile}
- COMMAND tolua++app_orxonox -n ${_tolua_package}
- -w ${CMAKE_CURRENT_SOURCE_DIR}
- -o ${_tolua_cxxfile}
- -H ${_tolua_hfile}
- -s ${TOLUA_PARSER_SOURCE}
- ${_tolua_pkgfile}
+ COMMAND toluaapp_orxonox -n ${_tolua_package}
+ -w ${CMAKE_CURRENT_SOURCE_DIR}
+ -o ${_tolua_cxxfile}
+ -H ${_tolua_hfile}
+ -s ${TOLUA_PARSER_SOURCE}
+ ${_tolua_pkgfile}
DEPENDS ${TOLUA_PARSER_DEPENDENCIES}
IMPLICIT_DEPENDS ${_implicit_dependencies}
WORKING_DIRECTORY ${RUNTIME_LIBRARY_DIRECTORY}
Modified: code/branches/presentation3/src/external/ceguilua/CMakeLists.txt
===================================================================
--- code/branches/presentation3/src/external/ceguilua/CMakeLists.txt 2010-06-23 16:32:14 UTC (rev 7151)
+++ code/branches/presentation3/src/external/ceguilua/CMakeLists.txt 2010-06-23 17:00:18 UTC (rev 7152)
@@ -55,12 +55,12 @@
# Create the tolua bind file. We could use the orignal file though, but it is 1.6MB...
ADD_CUSTOM_COMMAND(
OUTPUT ${CEGUILUA_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lua_CEGUI.cpp
- COMMAND tolua++app_orxonox -n CEGUI
- -w ${CEGUILUA_BINARY_DIR}
- -o ${CMAKE_CFG_INTDIR}/lua_CEGUI.cpp
- -L exceptions.lua
- -s ${TOLUA_PARSER_SOURCE}
- CEGUI.pkg
+ COMMAND toluaapp_orxonox -n CEGUI
+ -w ${CEGUILUA_BINARY_DIR}
+ -o ${CMAKE_CFG_INTDIR}/lua_CEGUI.cpp
+ -L exceptions.lua
+ -s ${TOLUA_PARSER_SOURCE}
+ CEGUI.pkg
DEPENDS ${TOLUA_PARSER_DEPENDENCIES}
WORKING_DIRECTORY ${RUNTIME_LIBRARY_DIRECTORY}
COMMENT "Generating tolua bind files for package CEGUILua"
@@ -78,7 +78,7 @@
VERSION
${CEGUI_VERSION}
LINK_LIBRARIES
- tolua++_orxonox
+ tolua_orxonox
${LUA_LIBRARIES}
${CEGUI_LIBRARY}
SOURCE_FILES
Modified: code/branches/presentation3/src/external/tinyxml/CMakeLists.txt
===================================================================
--- code/branches/presentation3/src/external/tinyxml/CMakeLists.txt 2010-06-23 16:32:14 UTC (rev 7151)
+++ code/branches/presentation3/src/external/tinyxml/CMakeLists.txt 2010-06-23 17:00:18 UTC (rev 7152)
@@ -17,7 +17,7 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
-SET_SOURCE_FILES(TINYXML++_FILES
+SET_SOURCE_FILES(TINYXML_FILES
ticpp.h
ticpprc.h
tinystr.h
@@ -32,11 +32,11 @@
COMPILATION_END
)
-ORXONOX_ADD_LIBRARY(tinyxml++_orxonox
+ORXONOX_ADD_LIBRARY(tinyxml_orxonox
ORXONOX_EXTERNAL
NO_DLL_INTERFACE
VERSION
2.5.3
SOURCE_FILES
- ${TINYXML++_FILES}
+ ${TINYXML_FILES}
)
Modified: code/branches/presentation3/src/external/tolua/CMakeLists.txt
===================================================================
--- code/branches/presentation3/src/external/tolua/CMakeLists.txt 2010-06-23 16:32:14 UTC (rev 7151)
+++ code/branches/presentation3/src/external/tolua/CMakeLists.txt 2010-06-23 17:00:18 UTC (rev 7152)
@@ -19,7 +19,7 @@
################### Tolua++ library ###################
-SET_SOURCE_FILES(TOLUA++_FILES
+SET_SOURCE_FILES(TOLUA_FILES
tolua_event.h
tolua++.h
COMPILATION_BEGIN ToluaCompilation.c
@@ -31,7 +31,7 @@
COMPILATION_END
)
-ORXONOX_ADD_LIBRARY(tolua++_orxonox
+ORXONOX_ADD_LIBRARY(tolua_orxonox
ORXONOX_EXTERNAL
DEFINE_SYMBOL
"TOLUA_SHARED_BUILD"
@@ -40,13 +40,13 @@
LINK_LIBRARIES
${LUA_LIBRARIES}
SOURCE_FILES
- ${TOLUA++_FILES}
+ ${TOLUA_FILES}
)
################## Tolua++ generator ##################
-ORXONOX_ADD_EXECUTABLE(tolua++app_orxonox
+ORXONOX_ADD_EXECUTABLE(toluaapp_orxonox
ORXONOX_EXTERNAL
VERSION
1.0.92
@@ -60,7 +60,7 @@
# Set some variables to the cache in order to use them in the TOLUA macro
SET(TOLUA_PARSER_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua" CACHE INTERNAL "")
SET(TOLUA_PARSER_DEPENDENCIES
- tolua++app_orxonox
+ toluaapp_orxonox
${CMAKE_CURRENT_SOURCE_DIR}/all-${LUA_VERSION}.lua
${CMAKE_CURRENT_SOURCE_DIR}/lua/compat-5.1.lua
${CMAKE_CURRENT_SOURCE_DIR}/lua/compat.lua
Modified: code/branches/presentation3/src/libraries/core/CMakeLists.txt
===================================================================
--- code/branches/presentation3/src/libraries/core/CMakeLists.txt 2010-06-23 16:32:14 UTC (rev 7151)
+++ code/branches/presentation3/src/libraries/core/CMakeLists.txt 2010-06-23 17:00:18 UTC (rev 7152)
@@ -109,8 +109,8 @@
cpptcl_orxonox
ogreceguirenderer_orxonox
ois_orxonox
- tinyxml++_orxonox
- tolua++_orxonox
+ tinyxml_orxonox
+ tolua_orxonox
util
SOURCE_FILES
${CORE_SRC_FILES}
Modified: code/branches/presentation3/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/presentation3/src/orxonox/CMakeLists.txt 2010-06-23 16:32:14 UTC (rev 7151)
+++ code/branches/presentation3/src/orxonox/CMakeLists.txt 2010-06-23 17:00:18 UTC (rev 7152)
@@ -76,8 +76,8 @@
${VORBISFILE_LIBRARY}
${VORBIS_LIBRARY}
${OGG_LIBRARY}
- tinyxml++_orxonox
- tolua++_orxonox
+ tinyxml_orxonox
+ tolua_orxonox
bullet_orxonox
util
core
More information about the Orxonox-commit
mailing list