Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[75] trunk
|
From: <he...@us...> - 2009-07-26 08:35:38
|
Revision: 75
http://simspark.svn.sourceforge.net/simspark/?rev=75&view=rev
Author: hedayat
Date: 2009-07-26 08:35:30 +0000 (Sun, 26 Jul 2009)
Log Message:
-----------
Try to detect correct ODE flag in Windows
Try to copy all required .dll files to rcssserver3d's bin/ directory
Add environment variables for installation directory in NSIS installer (Windows)
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/cmake/FindODE.cmake
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-07-24 16:59:55 UTC (rev 74)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-07-26 08:35:30 UTC (rev 75)
@@ -85,6 +85,28 @@
install(FILES ${CMAKE_BINARY_DIR}/rcssserver3d_config.h
DESTINATION ${INCLUDEDIR}/${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"
@@ -112,6 +134,11 @@
set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
set(CPACK_NSIS_CONTACT "sim...@li...")
+set(CREATE_BATCH_FILES "ClearErrors\nFileOpen \$0
+\$INSTDIR\\\\bin\\\\simspark.bat w\nFileWrite \$0
+'PATH=%PATH%;%SPARK_DIR%\\\\lib\\\\simspark;%RCSSSERVER3D_DIR%\\\\lib\\\\rcssserver3d\$\\\\nsimspark.exe'\nFileClose \$0")
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "WriteRegExpandStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR' '\$INSTDIR'\n${CREATE_BATCH_FILES}")
+set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete '\$INSTDIR\\\\bin\\\\simspark.bat'\nDeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'RCSSSERVER3D_DIR'")
include(CPack)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-07-24 16:59:55 UTC (rev 74)
+++ trunk/rcssserver3d/ChangeLog 2009-07-26 08:35:30 UTC (rev 75)
@@ -1,3 +1,11 @@
+2009-07-26 Hedayat Vatankhah <he...@gr...>
+
+ * CMakeLists.txt:
+ - try to find and copy all thirdparty dlls in the binary package's bin/
+ directory.
+ - set RCSSSERVER3D_DIR environment variable when using NSIS installer
+ - creating simspark.bat file in windows (by the installer)
+
2009-07-24 Marian Buchta <mar...@gm...>
* cmake/FindBoost.cmake
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-07-24 16:59:55 UTC (rev 74)
+++ trunk/spark/CMakeLists.txt 2009-07-26 08:35:30 UTC (rev 75)
@@ -208,6 +208,10 @@
set(CPACK_NSIS_HELP_LINK "TODO:simspark wiki link")
set(CPACK_NSIS_URL_INFO_ABOUT "http://simspark.sourceforge.net")
set(CPACK_NSIS_CONTACT "sim...@li...")
+#set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "Push \$INSTDIR\\\\lib\\\\${CMAKE_PROJECT_NAME}\nCall AddToPath")
+#set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Push \$INSTDIR\\\\lib\\\\${CMAKE_PROJECT_NAME}\nCall un.RemoveFromPath")
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "WriteRegExpandStr HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'SPARK_DIR' '\$INSTDIR'")
+set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "DeleteRegValue HKLM 'SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\\' 'SPARK_DIR'")
include(CPack)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-07-24 16:59:55 UTC (rev 74)
+++ trunk/spark/ChangeLog 2009-07-26 08:35:30 UTC (rev 75)
@@ -1,3 +1,11 @@
+2009-07-26 Hedayat Vatankhah <he...@gr...>
+
+ * CMakeLists.txt:
+ - set SPARK_DIR environment flag when installed using NSIS installer
+
+ * cmake/FindODE.cmake:
+ - try to detect correct ODE preprocessor flag on Windows
+
2009-07-24 Marian Buchta <mar...@gm...>
* cmake/FindRuby.cmake
Modified: trunk/spark/cmake/FindODE.cmake
===================================================================
--- trunk/spark/cmake/FindODE.cmake 2009-07-24 16:59:55 UTC (rev 74)
+++ trunk/spark/cmake/FindODE.cmake 2009-07-26 08:35:30 UTC (rev 75)
@@ -43,13 +43,6 @@
ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
ENDIF(ODE_CONFIG)
- IF (ODE_EXTRA_CFLAGS)
- SET(ODE_CFLAGS ${ODE_EXTRA_CFLAGS} CACHE STRING "Additional ODE flags")
- MESSAGE(STATUS "Found additional flags for ODE: ${ODE_CFLAGS}")
- ELSE (ODE_EXTRA_CFLAGS)
- SET(ODE_CFLAGS CACHE STRING "Additional ODE flags")
- ENDIF (ODE_EXTRA_CFLAGS)
-
FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
/usr/include
/usr/local/include
@@ -69,12 +62,25 @@
C:/library/ode/lib/
"C:/Program Files/ode/lib/"
C:/ode/lib/
- PATH_SUFFIXES
- releaselib
- ReleaseDoubleDLL ReleaseDoubleLib
- ReleaseSingleDLL ReleaseSingleLib
+ PATH_SUFFIXES
+ releaselib
+ ReleaseDoubleDLL ReleaseDoubleLib
+ ReleaseSingleDLL ReleaseSingleLib
)
+ IF(WIN32 AND "${ODE_LIBRARY}" MATCHES ".*double.*")
+ SET(ODE_EXTRA_CFLAGS "-DdDOUBLE")
+ ELSE(WIN32 AND "${ODE_LIBRARY}" MATCHES ".*double.*")
+ SET(ODE_EXTRA_CFLAGS "-DdSINGLE")
+ ENDIF(WIN32 AND "${ODE_LIBRARY}" MATCHES ".*double.*")
+
+ IF (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS ${ODE_EXTRA_CFLAGS} CACHE STRING "Additional ODE flags")
+ MESSAGE(STATUS "Found additional flags for ODE: ${ODE_CFLAGS}")
+ ELSE (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS CACHE STRING "Additional ODE flags")
+ ENDIF (ODE_EXTRA_CFLAGS)
+
IF(ODE_INCLUDE_DIR)
MESSAGE(STATUS "Found ODE include dir: ${ODE_INCLUDE_DIR}")
ELSE(ODE_INCLUDE_DIR)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
