Revision: 77669
http://sourceforge.net/p/brlcad/code/77669
Author: starseeker
Date: 2020-11-03 17:58:32 +0000 (Tue, 03 Nov 2020)
Log Message:
-----------
Fix symlink logic for OSX, couple fixes for Apple/clang on github runner.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/exppp.c
brlcad/branches/extbuild/src/other/ext/stepcode/src/express/express.c
brlcad/branches/extbuild/src/other/ext/stepcode.cmake
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/exppp.c
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/exppp.c
2020-11-03 13:17:58 UTC (rev 77668)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/src/exppp/exppp.c
2020-11-03 17:58:32 UTC (rev 77669)
@@ -1,3 +1,5 @@
+#include "sc_cf.h"
+
#include <sc_memmgr.h>
#include <stdlib.h>
#include <stdio.h>
@@ -5,6 +7,13 @@
#include <errno.h>
#include <stdarg.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
#include "../express/expbasic.h"
#include "../express/express.h"
#include "exppp.h"
Modified: brlcad/branches/extbuild/src/other/ext/stepcode/src/express/express.c
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/src/express/express.c
2020-11-03 13:17:58 UTC (rev 77668)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/src/express/express.c
2020-11-03 17:58:32 UTC (rev 77669)
@@ -85,6 +85,9 @@
#include "expscan.h"
#include "parse_data.h"
+extern void SCANcleanup( void );
+extern void parserInitState();
+
void * ParseAlloc( void * ( *mallocProc )( size_t ) );
void ParseFree( void * parser, void ( *freeProc )( void * ) );
void Parse( void * parser, int tokenID, YYSTYPE data, parse_data_t parseData );
Modified: brlcad/branches/extbuild/src/other/ext/stepcode.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-11-03
13:17:58 UTC (rev 77668)
+++ brlcad/branches/extbuild/src/other/ext/stepcode.cmake 2020-11-03
17:58:32 UTC (rev 77669)
@@ -56,24 +56,29 @@
# Tell the parent build about files and libraries
set(STEPCODE_LIBS base express stepcore stepeditor stepdai steputils)
foreach(SCLIB ${STEPCODE_LIBS})
+ set(SYMLINK_1 ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
if (APPLE)
- set(SYMLINK_1 ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(SYMLINK_2 ${SC_PREFIX}${SCLIB}.2${CMAKE_SHARED_LIBRARY_SUFFIX})
else (APPLE)
- set(SYMLINK_1 ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX})
set(SYMLINK_2 ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}.2)
endif (APPLE)
ExternalProject_Target(SHARED ${SCLIB} STEPCODE_BLD ${STEPCODE_INSTDIR}
${SC_PREFIX}${SCLIB}${SC_SUFFIX}
- SYMLINKS
${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX};${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}.2
+ SYMLINKS ${SYMLINK_1};${SYMLINK_2}
LINK_TARGET ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
endforeach(SCLIB ${STEPCODE_LIBS})
# libexppp is a special naming case, to avoid conflict with the exppp
executable
+ set(SYMLINK_1 libexppp${CMAKE_SHARED_LIBRARY_SUFFIX})
+ if (APPLE)
+ set(SYMLINK_2 libexppp.2${CMAKE_SHARED_LIBRARY_SUFFIX})
+ else (APPLE)
+ set(SYMLINK_2 libexppp${CMAKE_SHARED_LIBRARY_SUFFIX}.2)
+ endif (APPLE)
ExternalProject_Target(SHARED libexppp STEPCODE_BLD ${STEPCODE_INSTDIR}
libexppp${SC_SUFFIX}
- SYMLINKS
libexppp${CMAKE_SHARED_LIBRARY_SUFFIX};libexppp${CMAKE_SHARED_LIBRARY_SUFFIX}.2
+ SYMLINKS ${SYMLINK_1};${SYMLINK_2}
LINK_TARGET libexppp${CMAKE_SHARED_LIBRARY_SUFFIX}
RPATH
)
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
