Commit: 520fcf7de71361fac63e1ff47e7e392d7de51c90 - HotshotOgreIOS (hg)

Commit MetaInfo

• Revision: 520fcf7de71361fac63e1ff47e7e392d7de51c90 (tree)
• Time: 2016-02-17 03:25:54
• Author: arkeon
• Commiter: arkeon

Log Message

Corrections on cmake scripts for static build on windows

Change Summary

• modified: CMake/CMakeLists.txt
• modified: CMake/Dependencies.cmake
• modified: CMake/Packages/FindOGRE.cmake
• modified: Samples/CMakeLists.txt
• modified: Tests/CMakeLists.txt

Incremental Difference

diff -r 679e65ce667a -r 520fcf7de713 CMake/CMakeLists.txt
--- a/CMake/CMakeLists.txt	Tue Feb 16 18:56:01 2016 +0200
+++ b/CMake/CMakeLists.txt	Tue Feb 16 19:25:54 2016 +0100
@@ -43,6 +43,7 @@
 set(STATIC_INST_FILES
   Packages/FindCg.cmake
   Packages/FindDirectX.cmake
+  Packages/FindDirectX11.cmake
   Packages/FindFreeImage.cmake
   Packages/FindFreetype.cmake
   Packages/FindOpenGLES.cmake
@@ -50,6 +51,8 @@
   Packages/FindZLIB.cmake
   Packages/FindZZip.cmake
   Packages/FindSoftimage.cmake
+  Packages/FindGLSLOptimizer.cmake
+  Packages/FindHLSL2GLSL.cmake
 )
 if (WIN32)
   set(INST_FILES ${INST_FILES}

diff -r 679e65ce667a -r 520fcf7de713 CMake/Dependencies.cmake
--- a/CMake/Dependencies.cmake	Tue Feb 16 18:56:01 2016 +0200
+++ b/CMake/Dependencies.cmake	Tue Feb 16 19:25:54 2016 +0100
@@ -173,10 +173,12 @@
     set(Boost_COMPILER -gcc)
 endif()
 
-set(Boost_ADDITIONAL_VERSIONS "1.57" "1.57.0" "1.56" "1.56.0" "1.55" "1.55.0" "1.54" "1.54.0" "1.53" "1.53.0" "1.52" "1.52.0" "1.51" "1.51.0" "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40")
-# Components that need linking (NB does not include header-only components like bind)
-set(OGRE_BOOST_COMPONENTS thread date_time)
-find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
+if (NOT Boost_FOUND)
+  set(Boost_ADDITIONAL_VERSIONS "1.57" "1.57.0" "1.56" "1.56.0" "1.55" "1.55.0" "1.54" "1.54.0" "1.53" "1.53.0" "1.52" "1.52.0" "1.51" "1.51.0" "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0" "1.47" "1.47.0" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0" "1.41.0" "1.41" "1.40.0" "1.40")
+  # Components that need linking (NB does not include header-only components like bind)
+  set(OGRE_BOOST_COMPONENTS thread date_time)
+  find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
+endif()
 if (NOT Boost_FOUND)
 	# Try again with the other type of libs
 	if(Boost_USE_STATIC_LIBS)

diff -r 679e65ce667a -r 520fcf7de713 CMake/Packages/FindOGRE.cmake
--- a/CMake/Packages/FindOGRE.cmake	Tue Feb 16 18:56:01 2016 +0200
+++ b/CMake/Packages/FindOGRE.cmake	Tue Feb 16 19:25:54 2016 +0100
@@ -31,7 +31,7 @@
 #  RenderSystem_GL, RenderSystem_GL3Plus,
 #  RenderSystem_GLES, RenderSystem_GLES2,
 #  RenderSystem_Direct3D9, RenderSystem_Direct3D11
-#  Paging, Terrain, Volume, Overlay
+#  Paging, Terrain, Volume, Overlay, MeshLodGenerator, HLMS
 #
 # For each of these components, the following variables are defined:
 #
@@ -148,7 +148,7 @@
 endif ()
 
 # redo search if any of the environmental hints changed
-set(OGRE_COMPONENTS Paging Terrain Volume Overlay 
+set(OGRE_COMPONENTS Paging Terrain Volume Overlay MeshLodGenerator HLMS
   Plugin_BSPSceneManager Plugin_CgProgramManager Plugin_OctreeSceneManager
   Plugin_OctreeZone Plugin_PCZSceneManager Plugin_ParticleFX
   RenderSystem_Direct3D11 RenderSystem_Direct3D9 RenderSystem_GL RenderSystem_GL3Plus RenderSystem_GLES RenderSystem_GLES2)
@@ -264,6 +264,7 @@
   set(OGRE_DEPS_FOUND TRUE)
   find_package(Cg QUIET)
   find_package(DirectX QUIET)
+  find_package(DirectX11 QUIET)
   find_package(FreeImage QUIET)
   find_package(Freetype QUIET)
   find_package(OpenGL QUIET)
@@ -422,6 +423,10 @@
 ogre_find_component(Volume OgreVolumePrerequisites.h)
 # look for Overlay component
 ogre_find_component(Overlay OgreOverlaySystem.h)
+# look for MeshLodGenerator component
+ogre_find_component(MeshLodGenerator OgreMeshLodGenerator.h)
+# look for HLMS component
+ogre_find_component(HLMS OgreHlmsManager.h)
 
 #########################################################
 # Find Ogre plugins
@@ -521,7 +526,7 @@
         
 if (OGRE_STATIC)
   # check if dependencies for plugins are met
-  if (NOT DirectX_FOUND)
+  if (NOT DirectX9_FOUND)
     set(OGRE_RenderSystem_Direct3D9_FOUND FALSE)
   endif ()
   if (NOT DirectX_D3D11_FOUND)
@@ -544,7 +549,7 @@
   endif ()
   
   set(OGRE_RenderSystem_Direct3D9_LIBRARIES ${OGRE_RenderSystem_Direct3D9_LIBRARIES}
-    ${DirectX_LIBRARIES}
+    ${DirectX9_LIBRARIES}
   )
 
   set(OGRE_RenderSystem_Direct3D11_LIBRARIES ${OGRE_RenderSystem_Direct3D11_LIBRARIES}

diff -r 679e65ce667a -r 520fcf7de713 Samples/CMakeLists.txt
--- a/Samples/CMakeLists.txt	Tue Feb 16 18:56:01 2016 +0200
+++ b/Samples/CMakeLists.txt	Tue Feb 16 19:25:54 2016 +0100
@@ -117,7 +117,6 @@
 		set(RESOURCE_FILES
     		${OGRE_SOURCE_DIR}/OgreMain/src/WIN32/resource.h
 	    	${OGRE_SOURCE_DIR}/OgreMain/src/WIN32/OgreWin32Resources.rc
-    		${OGRE_SOURCE_DIR}/OgreMain/src/WIN32/winres.h
 		)
 		source_group(Resources FILES ${RESOURCE_FILES})
 	endif ()

diff -r 679e65ce667a -r 520fcf7de713 Tests/CMakeLists.txt
--- a/Tests/CMakeLists.txt	Tue Feb 16 18:56:01 2016 +0200
+++ b/Tests/CMakeLists.txt	Tue Feb 16 19:25:54 2016 +0100
@@ -79,7 +79,6 @@
       set(RESOURCE_FILES
         ${OGRE_SOURCE_DIR}/OgreMain/src/WIN32/resource.h
         ${OGRE_SOURCE_DIR}/OgreMain/src/WIN32/OgreWin32Resources.rc
-        ${OGRE_SOURCE_DIR}/OgreMain/src/WIN32/winres.h
         )
       source_group(Resources FILES ${RESOURCE_FILES})
     endif ()