--- openSG/CMake/ConfigurePackages.cmake	2011-10-08 19:33:16.072148600 +0200
+++ ./ConfigurePackages.cmake	2011-10-18 21:24:31.586594700 +0200
@@ -147,12 +147,12 @@
 
       IF(WIN32)
         OSG_FIND_PACKAGE(GDAL)
+        
+        IF(GDAL_FOUND)
+          OSG_ADD_IMPORT_LIB(OSG_GDAL_TARGETS GDAL_LIBRARY)
 
-#        IF(GDAL_FOUND)
-#          OSG_ADD_IMPORT_LIB(OSG_GDAL_TARGETS GDAL_LIBRARY)
-
-#          SET(GDAL_LIBRARIES ${OSG_GDAL_TARGETS} CACHE STRING "" FORCE)
-#        ENDIF(GDAL_FOUND)
+          SET(GDAL_LIBRARIES ${OSG_GDAL_TARGETS} CACHE STRING "" FORCE)
+        ENDIF(GDAL_FOUND)
 
       ELSE(WIN32)
         OSG_FIND_PACKAGE(GDAL)
@@ -550,22 +550,22 @@
             ENDIF(OSG_USE_STATIC_SUPPORT_LIBS)
         ENDIF()
 
-        SET(OSG_OPENNURBS_TARGETS )
+    ENDIF(OSG_USE_OSGSUPPORT_LIBS)
 
-        IF(OPENNURBS_INCLUDE_DIR)
-          IF(OPENNURBS_LIBRARY_DEBUG OR OPENNURBS_LIBRARY_RELEASE)
-            SET(OPENNURBS_FOUND TRUE)
-          ENDIF()
-        ENDIF()
+    SET(OSG_OPENNURBS_TARGETS )
 
-        IF(OPENNURBS_FOUND)
-            OSG_ADD_IMPORT_LIB(OSG_OPENNURBS_TARGETS OPENNURBS_LIBRARY)
+    IF(OPENNURBS_INCLUDE_DIR)
+      IF(OPENNURBS_LIBRARY_DEBUG OR OPENNURBS_LIBRARY_RELEASE)
+        SET(OPENNURBS_FOUND TRUE)
+      ENDIF()
+    ENDIF()
 
-            SET(OPENNURBS_TARGET_FOUND TRUE)
-            SET(OPENNURBS_LIBRARIES ${OSG_OPENNURBS_TARGETS} CACHE STRING "" FORCE)
-        ENDIF(OPENNURBS_FOUND)
+    IF(OPENNURBS_FOUND)
+        OSG_ADD_IMPORT_LIB(OSG_OPENNURBS_TARGETS OPENNURBS_LIBRARY)
 
-    ENDIF(OSG_USE_OSGSUPPORT_LIBS)
+        SET(OPENNURBS_TARGET_FOUND TRUE)
+        SET(OPENNURBS_LIBRARIES ${OSG_OPENNURBS_TARGETS} CACHE STRING "" FORCE)
+    ENDIF(OPENNURBS_FOUND)
 
 ENDMACRO(OSG_CONFIGURE_OPENNURBS)
 
@@ -690,6 +690,8 @@
         ENDIF()
 #      ENDIF()
 
+    ENDIF(OSG_USE_OSGSUPPORT_LIBS AND WIN32)
+
       IF(GLEW_INCLUDE_DIR)
         IF(GLEW_LIBRARY_DEBUG OR GLEW_LIBRARY_RELEASE)
           SET(GLEW_FOUND TRUE)
@@ -701,8 +703,6 @@
         SET(GLEW_LIBRARIES ${OSG_GLEW_TARGETS} CACHE STRING "" FORCE)
       ENDIF(GLEW_FOUND)
 
-    ENDIF(OSG_USE_OSGSUPPORT_LIBS AND WIN32)
-
 #    IF(NOT OSG_USE_OSGSUPPORT_LIBS OR NOT GLEW_FOUND)
 #
 #      OSG_FIND_PACKAGE(GLEW)
@@ -747,18 +747,18 @@
 
         ENDIF()
 
-        IF(OSG_LIBMINI_INCLUDE_DIR)
-            IF(OSG_LIBMINI_LIBRARY_DEBUG OR OSG_LIBMINI_LIBRARY_RELEASE)
-                SET(OSG_LIBMINI_FOUND TRUE CACHE INTERNAL "" FORCE)
-            ENDIF()
-        ENDIF()
+    ENDIF(OSG_USE_OSGSUPPORT_LIBS)
 
-        IF(OSG_LIBMINI_FOUND)
-          OSG_ADD_IMPORT_LIB(OSG_LIBMINI_TARGETS OSG_LIBMINI_LIBRARY)
-          SET(OSG_LIBMINI_LIBRARIES ${OSG_LIBMINI_TARGETS} CACHE STRING "" FORCE)
-        ENDIF(OSG_LIBMINI_FOUND)
+    IF(OSG_LIBMINI_INCLUDE_DIR)
+        IF(OSG_LIBMINI_LIBRARY_DEBUG OR OSG_LIBMINI_LIBRARY_RELEASE)
+            SET(OSG_LIBMINI_FOUND TRUE CACHE INTERNAL "" FORCE)
+        ENDIF()
+    ENDIF()
 
-    ENDIF(OSG_USE_OSGSUPPORT_LIBS)
+    IF(OSG_LIBMINI_FOUND)
+      OSG_ADD_IMPORT_LIB(OSG_LIBMINI_TARGETS OSG_LIBMINI_LIBRARY)
+      SET(OSG_LIBMINI_LIBRARIES ${OSG_LIBMINI_TARGETS} CACHE STRING "" FORCE)
+    ENDIF(OSG_LIBMINI_FOUND)
 
     IF(OSG_LIBMINI_FOUND)
         OSG_SET(OSG_WITH_LIBMINI 1)