[brlcad-commits] SF.net SVN: brlcad:[50370] brlcad/branches/STABLE/src/other/libz/CMakeLists .txt

[<sta...@us...>]

Revision: 50370
          http://brlcad.svn.sourceforge.net/brlcad/?rev=50370&view=rev
Author:   starseeker
Date:     2012-04-30 15:10:47 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Add workaround for MSVC2010 64 bit and zlib from trunk r49887

Revision Links:
--------------
    http://brlcad.svn.sourceforge.net/brlcad/?rev=49887&view=rev

Modified Paths:
--------------
    brlcad/branches/STABLE/src/other/libz/CMakeLists.txt

Modified: brlcad/branches/STABLE/src/other/libz/CMakeLists.txt
===================================================================
--- brlcad/branches/STABLE/src/other/libz/CMakeLists.txt	2012-04-30 15:06:35 UTC (rev 50369)
+++ brlcad/branches/STABLE/src/other/libz/CMakeLists.txt	2012-04-30 15:10:47 UTC (rev 50370)
@@ -131,6 +131,9 @@
 
 if(BUILD_STATIC_LIBS)
     add_library(zlib-static STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+    if(CMAKE_CL_64)
+      set_target_properties(zlib-static PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
+    endif(CMAKE_CL_64)
 endif(BUILD_STATIC_LIBS)
 
 set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)

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