Revision: 77505
http://sourceforge.net/p/brlcad/code/77505
Author: starseeker
Date: 2020-10-19 16:25:44 +0000 (Mon, 19 Oct 2020)
Log Message:
-----------
The MSVC prefix handling breaks down for libexppp, which is special cased so
the CMake target doesn't conflict with the exppp executable. Should probably
rename one or the other...
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-19 16:11:38 UTC (rev 77504)
+++ brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-19 16:25:44 UTC (rev 77505)
@@ -48,7 +48,7 @@
)
# Tell the parent build about files and libraries
- set(STEPCODE_LIBS base express exppp stepcore stepeditor stepdai steputils)
+ set(STEPCODE_LIBS base express stepcore stepeditor stepdai steputils)
foreach(SCLIB ${STEPCODE_LIBS})
ExternalProject_Target(SHARED ${SCLIB} STEPCODE_BLD ${STEPCODE_INSTDIR}
${SC_PREFIX}${SCLIB}${SC_SUFFIX}
@@ -57,6 +57,13 @@
RPATH
)
endforeach(SCLIB ${STEPCODE_LIBS})
+ # libexppp is a special naming case, to avoid conflict with the exppp
executable
+ ExternalProject_Target(SHARED libexppp STEPCODE_BLD ${STEPCODE_INSTDIR}
+ libexppp${SC_SUFFIX}
+ SYMLINKS
libexppp${CMAKE_SHARED_LIBRARY_SUFFIX};libexppp${CMAKE_SHARED_LIBRARY_SUFFIX}.2
+ LINK_TARGET libexppp${CMAKE_SHARED_LIBRARY_SUFFIX}
+ RPATH
+ )
set(STEPCODE_EXECS check-express exppp exp2cxx)
foreach(SCEXEC ${STEPCODE_EXECS})
ExternalProject_Target(EXEC ${SCEXEC}_exe STEPCODE_BLD ${STEPCODE_INSTDIR}
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
