Revision: 76978
http://sourceforge.net/p/brlcad/code/76978
Author: starseeker
Date: 2020-08-27 14:50:09 +0000 (Thu, 27 Aug 2020)
Log Message:
-----------
Couple more naming adjustments for 3rd party libs
Modified Paths:
--------------
brlcad/trunk/src/external/Creo/CMakeLists.txt
Modified: brlcad/trunk/src/external/Creo/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/external/Creo/CMakeLists.txt 2020-08-27 14:44:09 UTC
(rev 76977)
+++ brlcad/trunk/src/external/Creo/CMakeLists.txt 2020-08-27 14:50:09 UTC
(rev 76978)
@@ -210,10 +210,10 @@
SPSR
gdiam
openNURBS
- p2t
+ poly2tri
regex_brl
vds
- z_brl
+ z_brl1
)
set(BRLCAD_STATIC_LIBS)
set(brlcadlibs_notinstalled)
@@ -223,7 +223,12 @@
configure_file(${BRLCAD_ROOT_DIR}/bin/${blib}.dll
${CMAKE_CURRENT_BINARY_DIR}/${CFG_TYPE}/${blib}.dll COPYONLY)
endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
configure_file(${BRLCAD_ROOT_DIR}/bin/${blib}.dll
${CMAKE_CURRENT_BINARY_DIR}/${blib}.dll COPYONLY)
- set(BRLCAD_STATIC_LIBS ${BRLCAD_STATIC_LIBS}
"${BRLCAD_ROOT_DIR}/lib/${blib}.lib")
+ # Sigh - zlib doesn't follow the general pattern
+ if("${blib}" STREQUAL "z_brl1")
+ set(BRLCAD_STATIC_LIBS ${BRLCAD_STATIC_LIBS}
"${BRLCAD_ROOT_DIR}/lib/z_brl.lib")
+ else("${blib}" STREQUAL "z_brl1")
+ set(BRLCAD_STATIC_LIBS ${BRLCAD_STATIC_LIBS}
"${BRLCAD_ROOT_DIR}/lib/${blib}.lib")
+ endif("${blib}" STREQUAL "z_brl1")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${blib}.dll DESTINATION
"${MDIR}/${CREO_OBJ_DIR}")
if(NOT EXISTS ${CREO_ROOT_DIR}/${MDIR}/${CREO_OBJ_DIR}/${blib}.dll)
set(brlcadlibs_notinstalled "${brlcadlibs_notinstalled}\n
${blib}.dll")
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
