Changeset 52

Timestamp:

May 26, 2010, 10:00:16 AM (15 years ago)

Author:

Torben Dannhauer

Message:

Update CMakeLists.txt to support on the fly x64 builds coexistent to x86 builds on windows. Read CMakeLists.txt header for more information how to proceed.

File:

• osgVisual/CMakeLists.txt (modified) (2 diffs)

osgVisual/CMakeLists.txt

@@ +1 @@
+#################################################################################################
+# This file allows to configure osgVisual with CMAKE to generate native build solutions.                #
+#                                                                                                                                                                                               #
+# Specify the following environment variables to use osgVisual and this CMAKE script:                   #
+#       * OSG_ROOT: Path to your 32 bit (x86) OSG, e.g. D:\OSG\OpenSceneGraph-2.9.8_x86                         # 
+#       * OSG_ROOT_X64: Path to your 64 bit (x64) OSG, e.g. D:\OSG\OpenSceneGraph-2.9.8_x64                     #
+#       * OSG: Path to your 32 bit (x86) OSG and 3rdParty binary folder,                                                        #
+#                e.g. %OSG_ROOT%\bin;D:\OSG\3rdParty\bin\x86                                                                                    #
+#       * OSG_X64: Path to your 64 bit (x64) OSG and 3rdParty binary folder,                                            #
+#                e.g. %OSG_ROOT_X64%\bin;D:\OSG\3rdParty\bin\x64                                                                                #
+#       * PATH: Extend with %OSG% or %OSG_X64% to use OSG and osgVisual from command line,                      #
+#                e.g. PATH=%PATH%;%OSG%                                                                                                                                 #
+#                                                                                                                                                                                               #
+#       NOTE:   On Visual Studio and x64 Arch, CMAKE uses the project settings to specify the           #
+#                       correct x64 OSG path, so you can use osg as 32 bit in your system path.                         #
+#                                                                                                                                                                                               #
+#                                                                                                                                                                                               #
+#################################################################################################
+
 cmake_minimum_required(VERSION 2.8)
+
 
 PROJECT(osgVisual)
@@ -15 +35 @@
 ENDIF()
 
+
 # Get OSG Settings
-# SET(OpenSceneGraph_MARK_AS_ADVANCED ON)
+IF(DESTINATION_ARCH STREQUAL "x64")
+        SET(OSG_ROOT_BKP $ENV{OSG_ROOT})        # BACKUP old OSG_ROOT
+        SET(ENV{OSG_ROOT} $ENV{OSG_ROOT_X64})   # Replace OSGROOT with OSG_ROOT_X64 to force CMAKE to find the correct OSG version (64 bit)
+ENDIF ()
+
+SET(OpenSceneGraph_MARK_AS_ADVANCED ON)
 FIND_PACKAGE(OpenSceneGraph 2.9.7 REQUIRED osgViewer OpenThreads osgDB osgTerrain osgGA osgText osgSim osgUtil)
 FIND_PACKAGE(OpenGL REQUIRED)
+
+IF(DESTINATION_ARCH STREQUAL "x64")
+        SET(ENV{OSG_ROOT} ${OSG_ROOT_BKP})      # Restore old OSG_ROOT
+        UNSET(OSG_ROOT_BKP)                                     # Delete backup
+ENDIF ()
+
+
 
 # Module sky-silverlining - At the moment only for Win32, will be opened to Unix ASAP