Revision: 76975
http://sourceforge.net/p/brlcad/code/76975
Author: starseeker
Date: 2020-08-27 12:25:03 +0000 (Thu, 27 Aug 2020)
Log Message:
-----------
The adjustments to the src/other build logic have changed the lib names - quick
stab at updating them, but need to test.
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 12:17:55 UTC
(rev 76974)
+++ brlcad/trunk/src/external/Creo/CMakeLists.txt 2020-08-27 12:25:03 UTC
(rev 76975)
@@ -207,17 +207,16 @@
libbn
libbrep
libbu
- libgdiam
- liblz4
libnmg
- libp2t
librt
- libvds
libwdb
+ SPSR
+ gdiam
openNURBS
- regex
- zlib1
- libSPSR
+ p2t
+ regex_brl
+ vds
+ z_brl
)
set(BRLCAD_STATIC_LIBS)
set(brlcadlibs_notinstalled)
@@ -227,12 +226,7 @@
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)
- # Sigh - zlib doesn't follow the general pattern
- if("${blib}" STREQUAL "zlib1")
- set(BRLCAD_STATIC_LIBS ${BRLCAD_STATIC_LIBS}
"${BRLCAD_ROOT_DIR}/lib/zlib.lib")
- else("${blib}" STREQUAL "zlib1")
- set(BRLCAD_STATIC_LIBS ${BRLCAD_STATIC_LIBS}
"${BRLCAD_ROOT_DIR}/lib/${blib}.lib")
- endif("${blib}" STREQUAL "zlib1")
+ set(BRLCAD_STATIC_LIBS ${BRLCAD_STATIC_LIBS}
"${BRLCAD_ROOT_DIR}/lib/${blib}.lib")
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
