Revision: 77243
http://sourceforge.net/p/brlcad/code/77243
Author: starseeker
Date: 2020-09-26 15:50:10 +0000 (Sat, 26 Sep 2020)
Log Message:
-----------
Rename impacts Windows names as well.
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:34:38 UTC (rev 77242)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-09-26 15:50:10 UTC (rev 77243)
@@ -50,25 +50,19 @@
)
if (NOT MSVC)
ExternalProject_Target(zlib ZLIB_BLD
- OUTPUT_FILE libz${CMAKE_SHARED_LIBRARY_SUFFIX}.${ZLIB_VERSION}
+ OUTPUT_FILE libz_brl${CMAKE_SHARED_LIBRARY_SUFFIX}.${ZLIB_VERSION}
STATIC_OUTPUT_FILE libz${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
"libz${CMAKE_SHARED_LIBRARY_SUFFIX};libz${CMAKE_SHARED_LIBRARY_SUFFIX}.1"
- LINK_TARGET "libz${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ SYMLINKS
"libz_brl${CMAKE_SHARED_LIBRARY_SUFFIX};libz_brl${CMAKE_SHARED_LIBRARY_SUFFIX}.1"
+ LINK_TARGET "libz_brl${CMAKE_SHARED_LIBRARY_SUFFIX}"
RPATH
)
- set(ZLIB_BASENAME libz)
+ set(ZLIB_BASENAME libz_brl)
else (NOT MSVC)
ExternalProject_Target(zlib ZLIB_BLD
OUTPUT_FILE zlib${CMAKE_SHARED_LIBRARY_SUFFIX}
- STATIC_OUTPUT_FILE zlibstatic${CMAKE_STATIC_LIBRARY_SUFFIX}
- LINK_TARGET_DEBUG "zlibd${CMAKE_SHARED_LIBRARY_SUFFIX}"
- STATIC_LINK_TARGET_DEBUG "zlibstaticd${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ STATIC_OUTPUT_FILE z_brl${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*")
+ set(ZLIB_BASENAME z_brl)
endif (NOT MSVC)
ExternalProject_ByProducts(ZLIB_BLD ${INCLUDE_DIR}
@@ -122,7 +116,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>/${ZLIB_BASENAME}_brl$<TARGET_LINKER_FILE_SUFFIX:zlib>
+ -DZLIB_ROOT=${CMAKE_BINARY_DIR}
-DZLIB_LIBRARY=$<TARGET_LINKER_FILE_DIR:zlib>/${ZLIB_BASENAME}$<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
