Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[83] trunk/simspark-utilities
|
From: <mar...@us...> - 2009-08-07 12:27:52
|
Revision: 83
http://simspark.svn.sourceforge.net/simspark/?rev=83&view=rev
Author: marianbuchta
Date: 2009-08-07 12:27:42 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
Try to find and copy all thirdparty dlls in the simspark-utilities bin/ directory
Update script from rcssserver3d\cmake\FindSpark.cmake
Add RCSSNET3D_LIBRARIES and NET_LIBS - fixed linking error in VS2008
Modified Paths:
--------------
trunk/simspark-utilities/CMakeLists.txt
trunk/simspark-utilities/ChangeLog
trunk/simspark-utilities/cmake/FindSpark.cmake
trunk/simspark-utilities/sampleagent/CMakeLists.txt
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2009-07-31 20:40:14 UTC (rev 82)
+++ trunk/simspark-utilities/CMakeLists.txt 2009-08-07 12:27:42 UTC (rev 83)
@@ -4,10 +4,18 @@
set(PACKAGE_VERSION "0.1")
########## check for headerfiles/libraries ##########
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/ ${CMAKE_SOURCE_DIR}/../spark/cmake/)
find_package(Spark REQUIRED)
find_package(Boost REQUIRED)
+find_package(ODE REQUIRED)
+find_package(Freetype REQUIRED)
+find_package(SDL REQUIRED)
+find_package(DevIL REQUIRED)
+
+if (WIN32)
+ set(NET_LIBS WS2_32.lib)
+endif (WIN32)
########## add extra flags ##########
if(NOT CMAKE_BUILD_TYPE)
set (CMAKE_BUILD_TYPE Release)
@@ -32,6 +40,14 @@
mark_as_advanced(BINDIR LIBDIR DATADIR INCLUDEDIR)
+if(WIN32)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
+ include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+ link_directories(${Boost_LIBRARY_DIRS})
+ if(MSVC)
+ add_definitions(/Gm /Zi /GL)
+ endif(MSVC)
+endif(WIN32)
########## add subdirectories ############
add_subdirectory(data)
add_subdirectory(gendot)
@@ -44,6 +60,28 @@
install(FILES AUTHORS ChangeLog COPYING README
DESTINATION ${DATADIR}/doc/${CMAKE_PROJECT_NAME})
+if (WIN32)
+ string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
+ if (EXISTS ${ODEDLL})
+ install(PROGRAMS ${ODEDLL} DESTINATION ${BINDIR})
+ endif (EXISTS ${ODEDLL})
+
+ install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${BINDIR}
+ FILES_MATCHING PATTERN "*.dll")
+
+ string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${DevIL_LIBRARY_IL}")
+ if (EXISTS ${DevIL_DLL})
+ install(PROGRAMS ${DevIL_DLL} DESTINATION ${BINDIR})
+ endif (EXISTS ${DevIL_DLL})
+
+ install(DIRECTORY "${FREETYPE_INCLUDE_DIR_ft2build}/../bin/" DESTINATION ${BINDIR}
+ FILES_MATCHING PATTERN "*.dll")
+
+ set(SDL_DLL "${SDL_INCLUDE_DIR}/../lib/sdl.dll")
+ if (EXISTS ${SDL_DLL})
+ install(PROGRAMS ${SDL_DLL} DESTINATION ${BINDIR})
+ endif (EXISTS ${SDL_DLL})
+endif (WIN32)
########### uninstall support ############
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
@@ -55,7 +93,9 @@
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
-set(CPACK_SOURCE_IGNORE_FILES /CVS/ /[.]svn/ /.*[.]o$ /.*[.]o/ /[.].*)
+set(CPACK_SOURCE_IGNORE_FILES
+ /CVS/ /[.]svn/ /.*[.]o$ /.*[.]o/ /autom4te[.]cache/ /[.].* /bootstrap
+ /RELEASE /rpm.am /msi.am)
set(CPACK_PACKAGE_VERSION ${PACKAGE_VERSION})
set(CPACK_SOURCE_PACKAGE_FILE_NAME
${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION})
Modified: trunk/simspark-utilities/ChangeLog
===================================================================
--- trunk/simspark-utilities/ChangeLog 2009-07-31 20:40:14 UTC (rev 82)
+++ trunk/simspark-utilities/ChangeLog 2009-08-07 12:27:42 UTC (rev 83)
@@ -0,0 +1,10 @@
+2009-08-07 Marian Buchta <mar...@gm...>
+
+ * CMakeLists.txt
+ - try to find and copy all thirdparty dlls in the binary package's bin/ directory.
+
+ * cmake/FindSpark.cmake
+ - Update script from rcssserver3d\cmake\FindSpark.cmake
+
+ * sampleagent/CMakeLists.txt
+ - add RCSSNET3D_LIBRARIES and NET_LIBS - fixed linking error in VS2008
\ No newline at end of file
Modified: trunk/simspark-utilities/cmake/FindSpark.cmake
===================================================================
--- trunk/simspark-utilities/cmake/FindSpark.cmake 2009-07-31 20:40:14 UTC (rev 82)
+++ trunk/simspark-utilities/cmake/FindSpark.cmake 2009-08-07 12:27:42 UTC (rev 83)
@@ -17,6 +17,9 @@
# KEROSIN_INCLUDE_DIR - where to find kerosin include files
# KEROSIN_LIBRARIES - List of libraries when using kerosin.
# KEROSIN_FOUND - True if kerosin found.
+# RCSSNET3D_INCLUDE_DIR - where to find kerosin include files
+# RCSSNET3D_LIBRARIES - List of libraries when using kerosin.
+# RCSSNET3D_FOUND - True if kerosin found.
# Spark section
IF (SPARK_INCLUDE_DIR)
@@ -24,10 +27,16 @@
SET(SPARK_FIND_QUIETLY TRUE)
ENDIF (SPARK_INCLUDE_DIR)
-FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h PATH_SUFFIXES simspark)
+SET(SPARK_DIR $ENV{SPARK_DIR} "C:/Program Files/simspark" "C:/Library/simspark")
+FIND_PATH(SPARK_INCLUDE_DIR spark/spark.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
+
SET(SPARK_NAMES spark spark_debug)
-FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(SPARK_LIBRARY NAMES ${SPARK_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
GET_FILENAME_COMPONENT(SPARK_LIB_DIR ${SPARK_LIBRARY} PATH)
# handle the QUIETLY and REQUIRED arguments and set SPARK_FOUND to TRUE if
@@ -50,10 +59,14 @@
SET(SALT_FIND_QUIETLY TRUE)
ENDIF (SALT_INCLUDE_DIR)
-FIND_PATH(SALT_INCLUDE_DIR salt/salt.h PATH_SUFFIXES simspark)
+FIND_PATH(SALT_INCLUDE_DIR salt/salt.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(SALT_NAMES salt salt_debug)
-FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(SALT_LIBRARY NAMES ${SALT_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set SALT_FOUND to TRUE if
# all listed variables are TRUE
@@ -75,10 +88,14 @@
SET(ZEITGEIST_FIND_QUIETLY TRUE)
ENDIF (ZEITGEIST_INCLUDE_DIR)
-FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h PATH_SUFFIXES simspark)
+FIND_PATH(ZEITGEIST_INCLUDE_DIR zeitgeist/zeitgeist.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(ZEITGEIST_NAMES zeitgeist zeitgeist_debug)
-FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES} PATH_SUFFIXES simspark)
+FIND_LIBRARY(ZEITGEIST_LIBRARY NAMES ${ZEITGEIST_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set ZEITGEIST_FOUND to TRUE if
# all listed variables are TRUE
@@ -100,10 +117,14 @@
SET(OXYGEN_FIND_QUIETLY TRUE)
ENDIF (OXYGEN_INCLUDE_DIR)
-FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h PATH_SUFFIXES simspark)
+FIND_PATH(OXYGEN_INCLUDE_DIR oxygen/oxygen.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(OXYGEN_NAMES oxygen oxygen_debug)
-FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(OXYGEN_LIBRARY NAMES ${OXYGEN_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set OXYGEN_FOUND to TRUE if
# all listed variables are TRUE
@@ -125,10 +146,14 @@
SET(KEROSIN_FIND_QUIETLY TRUE)
ENDIF (KEROSIN_INCLUDE_DIR)
-FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h PATH_SUFFIXES simspark)
+FIND_PATH(KEROSIN_INCLUDE_DIR kerosin/kerosin.h
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
SET(KEROSIN_NAMES kerosin kerosin_debug)
-FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES} PATH_SUFFIXES simspark )
+FIND_LIBRARY(KEROSIN_LIBRARY NAMES ${KEROSIN_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
# handle the QUIETLY and REQUIRED arguments and set KEROSIN_FOUND to TRUE if
# all listed variables are TRUE
@@ -143,3 +168,32 @@
ENDIF(KEROSIN_FOUND)
MARK_AS_ADVANCED( KEROSIN_LIBRARY KEROSIN_INCLUDE_DIR )
+
+# rcssnet3D
+IF (RCSSNET3D_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(RCSSNET3D_FIND_QUIETLY TRUE)
+ENDIF (RCSSNET3D_INCLUDE_DIR)
+
+FIND_PATH(RCSSNET3D_INCLUDE_DIR rcssnet/addr.hpp
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark include/simspark)
+
+SET(RCSSNET3D_NAMES rcssnet3D rcssnet3D_debug)
+FIND_LIBRARY(RCSSNET3D_LIBRARY NAMES ${RCSSNET3D_NAMES}
+ PATHS ${SPARK_DIR}
+ PATH_SUFFIXES simspark lib/simspark)
+
+# handle the QUIETLY and REQUIRED arguments and set RCSSNET3D_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(RCSSNET3D DEFAULT_MSG RCSSNET3D_LIBRARY
+ RCSSNET3D_INCLUDE_DIR)
+
+IF(RCSSNET3D_FOUND)
+ SET( RCSSNET3D_LIBRARIES ${RCSSNET3D_LIBRARY} )
+ELSE(RCSSNET3D_FOUND)
+ SET( RCSSNET3D_LIBRARIES )
+ENDIF(RCSSNET3D_FOUND)
+
+MARK_AS_ADVANCED( RCSSNET3D_LIBRARY RCSSNET3D_INCLUDE_DIR )
Modified: trunk/simspark-utilities/sampleagent/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/sampleagent/CMakeLists.txt 2009-07-31 20:40:14 UTC (rev 82)
+++ trunk/simspark-utilities/sampleagent/CMakeLists.txt 2009-08-07 12:27:42 UTC (rev 83)
@@ -13,7 +13,7 @@
add_executable(sampleagent ${sampleagent_SRCS})
target_link_libraries(sampleagent ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES} ${RCSSNET3D_LIBRARIES} ${NET_LIBS})
set_target_properties(sampleagent PROPERTIES
INSTALL_RPATH "${RPATH_DIRECTORIES}")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
