From 0b5855fdeeed4845151a0ef4495853c22670b1e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20de=20l=27Hamaide?= <clemaez@hotmail.fr>
Date: Thu, 14 Nov 2013 02:35:33 +0100
Subject: [PATCH] Superbuild: fix 3rdParty 32/64 compatibility

---
 CMakeLists.txt     | 12 ++++++------
 installWinDeps.bat | 12 ++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94574a6..33bb252 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,10 +68,10 @@ elseif(MSVC)
     if (CMAKE_CL_64)
         set(OSG_MSVC ${OSG_MSVC}-64)
         set(WIN_TAG x64)
-        set(RDPARTY_DIR 3rdParty)
+        set(RDPARTY_DIR 3rdParty.x64)
     else ()
         set(WIN_TAG win32)
-        set(RDPARTY_DIR 3rdParty.x64)
+        set(RDPARTY_DIR 3rdParty)
     endif (CMAKE_CL_64)
   
     SET(OSG_CMAKE_ARGS
@@ -91,12 +91,12 @@ elseif(MSVC)
     list(APPEND OSG_DEPS WinDeps)
 else()
     # normal OSG
-    
+    set(OSG_INSTALL_PREFIX ${OSG_INSTALL_PREFIX}/OpenSceneGraph)
+    set(FG_INSTALL_PREFIX ${FG_INSTALL_PREFIX}/FlightGear)
+    set(SG_INSTALL_PREFIX ${SG_INSTALL_PREFIX}/SimGear)
 endif()
 
 if (MSVC)
-
-
     # download 3rdparty dependencies zip, including boost
     ExternalProject_Add(WinDeps
         DOWNLOAD_COMMAND URL http://files.goneabitbursar.com/fg/fgfs-${WIN_TAG}-VS100-3rdParty+OSG-20120411.zip
@@ -188,5 +188,5 @@ ExternalProject_Add(FlightGear
     UPDATE_COMMAND ""      # or update.
     SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/flightgear
     BINARY_DIR fgbuild 
-    CMAKE_ARGS ${FG_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${FG_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH=${OSG_INSTALL_PREFIX};${SG_INSTALL_PREFIX}
+    CMAKE_ARGS ${FG_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${FG_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH="${OSG_INSTALL_PREFIX};${SG_INSTALL_PREFIX}"
 )
diff --git a/installWinDeps.bat b/installWinDeps.bat
index 6926b48..c7df973 100644
--- a/installWinDeps.bat
+++ b/installWinDeps.bat
@@ -5,8 +5,12 @@ REM Instead we extract to a subdir, and then move the directories we want
 REM using this bat file.
 
 echo %CD%
-
-md 3rdParty
-xcopy /Y /E winDeps/3rdParty 3rdParty
-
+IF EXIST winDeps/3rdParty (
+    md 3rdParty
+    xcopy /Y /E winDeps/3rdParty 3rdParty
+)
+IF EXIST winDeps/3rdParty.x64 (
+    md 3rdParty.x64
+    xcopy /Y /E winDeps/3rdParty.x64 3rdParty.x64
+)
 echo "Done copying Windows deps"