Changeset 7163 for code/trunk/cmake
- Timestamp:
- Aug 11, 2010, 8:55:13 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 23 deleted
- 4 edited
- 24 copied
-
. (modified) (1 prop)
-
cmake/CapitaliseName.cmake (deleted)
-
cmake/CheckOGREPlugins.cmake (deleted)
-
cmake/CompareVersionStrings.cmake (deleted)
-
cmake/CompilerConfigMSVC.cmake (modified) (1 diff)
-
cmake/DetermineVersion.cmake (deleted)
-
cmake/FindALUT.cmake (deleted)
-
cmake/FindCEGUI.cmake (deleted)
-
cmake/FindDirectX.cmake (deleted)
-
cmake/FindENet.cmake (deleted)
-
cmake/FindLua.cmake (deleted)
-
cmake/FindOGRE.cmake (deleted)
-
cmake/FindOgg.cmake (deleted)
-
cmake/FindPackageHandleAdvancedArgs.cmake (deleted)
-
cmake/FindVorbis.cmake (deleted)
-
cmake/FlagUtilities.cmake (deleted)
-
cmake/GenerateToluaBindings.cmake (deleted)
-
cmake/GetGCCCompilerFlags.cmake (deleted)
-
cmake/HandleLibraryTypes.cmake (deleted)
-
cmake/InstallConfig.cmake (modified) (1 diff)
-
cmake/LibraryConfig.cmake (modified) (1 diff)
-
cmake/ParseMacroArguments.cmake (deleted)
-
cmake/PrecompiledHeaderFiles.cmake (deleted)
-
cmake/SeparateFlags.cmake (deleted)
-
cmake/SetCacheAdvanced.cmake (deleted)
-
cmake/SourceFileUtilities.cmake (deleted)
-
cmake/TargetUtilities.cmake (deleted)
-
cmake/tools (copied) (copied from code/branches/presentation3/cmake/tools)
-
cmake/tools/CapitaliseName.cmake (copied) (copied from code/branches/presentation3/cmake/tools/CapitaliseName.cmake)
-
cmake/tools/CheckOGREPlugins.cmake (copied) (copied from code/branches/presentation3/cmake/tools/CheckOGREPlugins.cmake)
-
cmake/tools/CompareVersionStrings.cmake (copied) (copied from code/branches/presentation3/cmake/tools/CompareVersionStrings.cmake)
-
cmake/tools/DetermineVersion.cmake (copied) (copied from code/branches/presentation3/cmake/tools/DetermineVersion.cmake)
-
cmake/tools/FindALUT.cmake (copied) (copied from code/branches/presentation3/cmake/tools/FindALUT.cmake)
-
cmake/tools/FindCEGUI.cmake (copied) (copied from code/branches/presentation3/cmake/tools/FindCEGUI.cmake)
-
cmake/tools/FindDirectX.cmake (copied) (copied from code/branches/presentation3/cmake/tools/FindDirectX.cmake)
-
cmake/tools/FindENet.cmake (copied) (copied from code/branches/presentation3/cmake/tools/FindENet.cmake)
-
cmake/tools/FindLua.cmake (copied) (copied from code/branches/presentation3/cmake/tools/FindLua.cmake)
-
cmake/tools/FindOGRE.cmake (copied) (copied from code/branches/presentation3/cmake/tools/FindOGRE.cmake)
-
cmake/tools/FindOgg.cmake (copied) (copied from code/branches/presentation3/cmake/tools/FindOgg.cmake)
-
cmake/tools/FindPackageHandleAdvancedArgs.cmake (copied) (copied from code/branches/presentation3/cmake/tools/FindPackageHandleAdvancedArgs.cmake)
-
cmake/tools/FindVorbis.cmake (copied) (copied from code/branches/presentation3/cmake/tools/FindVorbis.cmake)
-
cmake/tools/FlagUtilities.cmake (copied) (copied from code/branches/presentation3/cmake/tools/FlagUtilities.cmake)
-
cmake/tools/GenerateToluaBindings.cmake (copied) (copied from code/branches/presentation3/cmake/tools/GenerateToluaBindings.cmake)
-
cmake/tools/GetGCCCompilerFlags.cmake (copied) (copied from code/branches/presentation3/cmake/tools/GetGCCCompilerFlags.cmake)
-
cmake/tools/HandleLibraryTypes.cmake (copied) (copied from code/branches/presentation3/cmake/tools/HandleLibraryTypes.cmake)
-
cmake/tools/ParseMacroArguments.cmake (copied) (copied from code/branches/presentation3/cmake/tools/ParseMacroArguments.cmake)
-
cmake/tools/PrecompiledHeaderFiles.cmake (copied) (copied from code/branches/presentation3/cmake/tools/PrecompiledHeaderFiles.cmake)
-
cmake/tools/SeparateFlags.cmake (copied) (copied from code/branches/presentation3/cmake/tools/SeparateFlags.cmake)
-
cmake/tools/SetCacheAdvanced.cmake (copied) (copied from code/branches/presentation3/cmake/tools/SetCacheAdvanced.cmake)
-
cmake/tools/SourceFileUtilities.cmake (copied) (copied from code/branches/presentation3/cmake/tools/SourceFileUtilities.cmake)
-
cmake/tools/TargetUtilities.cmake (copied) (copied from code/branches/presentation3/cmake/tools/TargetUtilities.cmake)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/cmake/CompilerConfigMSVC.cmake
r6723 r7163 68 68 ADD_COMPILER_FLAGS("-D__WIN32__ -D_WIN32" CACHE) 69 69 ADD_COMPILER_FLAGS("-D_CRT_SECURE_NO_WARNINGS" CACHE) 70 ADD_COMPILER_FLAGS("-D_SCL_SECURE_NO_WARNINGS" CACHE) 70 71 71 72 # Overwrite CMake default flags here. -
code/trunk/cmake/InstallConfig.cmake
r5695 r7163 52 52 IF(UNIX) # Apple too? 53 53 # Using absolute paths 54 SET(RUNTIME_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/ bin)55 SET(LIBRARY_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/ orxonox)56 SET(ARCHIVE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/ orxonox/static)57 SET(MODULE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/ orxonox/modules)54 SET(RUNTIME_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/games) 55 SET(LIBRARY_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/games/orxonox) 56 SET(ARCHIVE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/games/orxonox/static) 57 SET(MODULE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/games/orxonox/modules) 58 58 SET(DOC_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/doc/orxonox) 59 SET(DATA_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/ orxonox)59 SET(DATA_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/games/orxonox) 60 60 ENDIF() 61 61 -
code/trunk/cmake/LibraryConfig.cmake
r6461 r7163 188 188 189 189 # More plugins: Plugin_BSPSceneManager, Plugin_OctreeSceneManager 190 SET(OGRE_PLUGINS_INT Plugin_ParticleFX)190 SET(OGRE_PLUGINS_INT "Plugin_ParticleFX;Plugin_BSPSceneManager") 191 191 IF(WIN32) 192 192 # CG program manager is probably DirectX related (not available under unix)
Note: See TracChangeset
for help on using the changeset viewer.
