[simspark-svn] SF.net SVN: simspark:[55] trunk/spark

[<he...@us...>]

Revision: 55
          http://simspark.svn.sourceforge.net/simspark/?rev=55&view=rev
Author:   hedayat
Date:     2009-03-07 11:38:32 +0000 (Sat, 07 Mar 2009)

Log Message:
-----------
ZLIB fix for Linux
respect SDLDIR environment variable

Modified Paths:
--------------
    trunk/spark/CMakeLists.txt
    trunk/spark/cmake/FindZLIB.cmake

Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt	2009-03-07 08:14:16 UTC (rev 54)
+++ trunk/spark/CMakeLists.txt	2009-03-07 11:38:32 UTC (rev 55)
@@ -36,7 +36,7 @@
 endif (NOT USE_COREFOUNDATION STREQUAL "OFF")
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
-set(ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" C:/SDL/)
+set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" C:/SDL/)
 
 if(WIN32)
 	set(Boost_USE_STATIC_LIBS ON)

Modified: trunk/spark/cmake/FindZLIB.cmake
===================================================================
--- trunk/spark/cmake/FindZLIB.cmake	2009-03-07 08:14:16 UTC (rev 54)
+++ trunk/spark/cmake/FindZLIB.cmake	2009-03-07 11:38:32 UTC (rev 55)
@@ -1,37 +1,42 @@
-# - Find zlib
-# Find the native ZLIB includes and library
-#
-#  ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
-#  ZLIB_LIBRARIES   - List of libraries when using zlib.
-#  ZLIB_FOUND       - True if zlib found.
-
-
-IF (ZLIB_INCLUDE_DIR)
-  # Already in cache, be silent
-  SET(ZLIB_FIND_QUIETLY TRUE)
-ENDIF (ZLIB_INCLUDE_DIR)
-
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
-	C:/library/zlib123
-	C:/zlib123
-	"C:/Program Files/zlib123"
-)
-
-FIND_LIBRARY(ZLIB_LIBRARY zlib1.lib 
-	C:/library/zlib123/projects/visualc6/Win32_DLL_Release
-	C:/zlib123/projects/visualc6/Win32_DLL_Release
-	"C:/Program Files/zlib123/projects/visualc6/Win32_DLL_Release"
-)
-
-# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-
-IF(ZLIB_FOUND)
-  SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
-ELSE(ZLIB_FOUND)
-  SET( ZLIB_LIBRARIES )
-ENDIF(ZLIB_FOUND)
-
-MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+# - Find zlib
+# Find the native ZLIB includes and library
+#
+#  ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
+#  ZLIB_LIBRARIES   - List of libraries when using zlib.
+#  ZLIB_FOUND       - True if zlib found.
+
+
+IF (ZLIB_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(ZLIB_FIND_QUIETLY TRUE)
+ENDIF (ZLIB_INCLUDE_DIR)
+
+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
+	$ENV{ZLIB_DIR}
+	C:/library/
+	C:/
+	"C:/Program Files/"
+	PATH_SUFFIXES zlib123
+)
+
+SET(ZLIB_NAMES z zlib zdll zlib1)
+FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES}
+	$ENV{ZLIB_DIR}
+	C:/library/zlib123/
+	C:/zlib123/
+	"C:/Program Files/zlib123/"
+	PATH_SUFFIXES projects/visualc6/Win32_DLL_Release
+)
+
+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+
+IF(ZLIB_FOUND)
+  SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
+ELSE(ZLIB_FOUND)
+  SET( ZLIB_LIBRARIES )
+ENDIF(ZLIB_FOUND)
+
+MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.