Revision: 65292
http://sourceforge.net/p/brlcad/code/65292
Author: starseeker
Date: 2015-06-15 00:54:32 +0000 (Mon, 15 Jun 2015)
Log Message:
-----------
Don't add zlib1.rc if we're doing the custom command verison.
Modified Paths:
--------------
brlcad/trunk/src/other/libz/CMakeLists.txt
Modified: brlcad/trunk/src/other/libz/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libz/CMakeLists.txt 2015-06-15 00:40:59 UTC (rev
65291)
+++ brlcad/trunk/src/other/libz/CMakeLists.txt 2015-06-15 00:54:32 UTC (rev
65292)
@@ -114,7 +114,6 @@
trees.c
uncompr.c
zutil.c
- win32/zlib1.rc
)
# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
@@ -132,6 +131,8 @@
-o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+else(MINGW)
+ set(ZLIB_SRCS ${ZLIB_SRCS} win32/zlib1.rc)
endif(MINGW)
add_library(zlib ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
