Revision: 77241
http://sourceforge.net/p/brlcad/code/77241
Author: starseeker
Date: 2020-09-26 01:26:24 +0000 (Sat, 26 Sep 2020)
Log Message:
-----------
The zlib name is a pain...
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-09-26 01:20:57 UTC (rev 77240)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-09-26 01:26:24 UTC (rev 77241)
@@ -56,6 +56,7 @@
LINK_TARGET "libz${CMAKE_SHARED_LIBRARY_SUFFIX}"
RPATH
)
+ set(ZLIB_BASENAME libz)
else (NOT MSVC)
ExternalProject_Target(zlib ZLIB_BLD
OUTPUT_FILE zlib${CMAKE_SHARED_LIBRARY_SUFFIX}
@@ -63,6 +64,11 @@
LINK_TARGET_DEBUG "zlibd${CMAKE_SHARED_LIBRARY_SUFFIX}"
STATIC_LINK_TARGET_DEBUG "zlibstaticd${CMAKE_STATIC_LIBRARY_SUFFIX}"
)
+ if ("${CMAKE_BUILD_TYPE}" MATCHES "*Debug*")
+ set(ZLIB_BASENAME zlibd)
+ else ("${CMAKE_BUILD_TYPE}" MATCHES "*Debug*")
+ set(ZLIB_BASENAME zlib)
+ endif ("${CMAKE_BUILD_TYPE}" MATCHES "*Debug*")
endif (NOT MSVC)
ExternalProject_ByProducts(ZLIB_BLD ${INCLUDE_DIR}
@@ -116,7 +122,7 @@
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DLIB_DIR=${LIB_DIR} -DBIN_DIR=${BIN_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
- -DZLIB_ROOT=${CMAKE_BINARY_DIR}
-DZLIB_LIBRARY=$<TARGET_LINKER_FILE_DIR:zlib>/$<TARGET_LINKER_FILE_PREFIX:zlib>z_brl$<TARGET_LINKER_FILE_SUFFIX:zlib>
+ -DZLIB_ROOT=${CMAKE_BINARY_DIR}
-DZLIB_LIBRARY=$<TARGET_LINKER_FILE_DIR:zlib>/${ZLIB_BASENAME}_brl$<TARGET_LINKER_FILE_SUFFIX:zlib>
DEPENDS ${ZLIB_TARGET}
)
else (TARGET zlib)
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
