Revision: 73015
http://sourceforge.net/p/brlcad/code/73015
Author: starseeker
Date: 2019-05-07 13:08:36 +0000 (Tue, 07 May 2019)
Log Message:
-----------
Satisfy Wdeclaration-after-statement, turn off semchk
Modified Paths:
--------------
brlcad/trunk/src/libbu/CMakeLists.txt
brlcad/trunk/src/librt/db_open.c
Modified: brlcad/trunk/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/CMakeLists.txt 2019-05-07 11:52:22 UTC (rev
73014)
+++ brlcad/trunk/src/libbu/CMakeLists.txt 2019-05-07 13:08:36 UTC (rev
73015)
@@ -153,22 +153,22 @@
# Define a pre-build test for libbu to check the semaphores in BRL-CAD's
headers for
# ordering issues
-set(BCAD_HDRS_FILE "${CMAKE_CURRENT_BINARY_DIR}/brlcad_headers.txt")
-file(REMOVE "${BCAD_HDRS_FILE}")
-file(GLOB_RECURSE BCAD_HDRS "${CMAKE_SOURCE_DIR}/include/*.h*")
-foreach(HDRF ${BCAD_HDRS})
- if (NOT "${HDRF}" MATCHES ".*.svn.*")
- file(APPEND "${BCAD_HDRS_FILE}" "${HDRF}\n")
- endif (NOT "${HDRF}" MATCHES ".*.svn.*")
-endforeach(HDRF ${BCAD_HDRS})
-DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/brlcad_headers.txt")
-BRLCAD_ADDEXEC(semchk "tests/semchk.cxx" "" NO_INSTALL)
-add_custom_command(
- TARGET libbu PRE_BUILD
- COMMAND $<TARGET_FILE:semchk> "${BCAD_HDRS_FILE}"
- COMMENT "Validating BRL-CAD library semaphore definitions"
- DEPENDS semchk
- )
+#set(BCAD_HDRS_FILE "${CMAKE_CURRENT_BINARY_DIR}/brlcad_headers.txt")
+#file(REMOVE "${BCAD_HDRS_FILE}")
+#file(GLOB_RECURSE BCAD_HDRS "${CMAKE_SOURCE_DIR}/include/*.h*")
+#foreach(HDRF ${BCAD_HDRS})
+# if (NOT "${HDRF}" MATCHES ".*.svn.*")
+# file(APPEND "${BCAD_HDRS_FILE}" "${HDRF}\n")
+# endif (NOT "${HDRF}" MATCHES ".*.svn.*")
+#endforeach(HDRF ${BCAD_HDRS})
+#DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/brlcad_headers.txt")
+#BRLCAD_ADDEXEC(semchk "tests/semchk.cxx" "" NO_INSTALL)
+#add_custom_command(
+# TARGET libbu PRE_BUILD
+# COMMAND $<TARGET_FILE:semchk> "${BCAD_HDRS_FILE}"
+# COMMENT "Validating BRL-CAD library semaphore definitions"
+# DEPENDS semchk
+# )
BRLCAD_ADDDATA(fix.6r vfont)
BRLCAD_ADDDATA(nonie.r.12 vfont)
@@ -182,6 +182,7 @@
mime.cmake
parallel.h
process.h
+ tests/semchk.cxx
sha1.h
vfont.h
vls_vprintf.h
Modified: brlcad/trunk/src/librt/db_open.c
===================================================================
--- brlcad/trunk/src/librt/db_open.c 2019-05-07 11:52:22 UTC (rev 73014)
+++ brlcad/trunk/src/librt/db_open.c 2019-05-07 13:08:36 UTC (rev 73015)
@@ -58,33 +58,33 @@
struct db_i *
db_open(const char *name, const char *mode)
{
+ static int sem_uses = 0;
+ extern int RT_SEM_WORKER;
+ extern int RT_SEM_RESULTS;
+ extern int RT_SEM_MODEL;
+ extern int RT_SEM_TREE0;
+ extern int RT_SEM_TREE1;
+ extern int RT_SEM_TREE2;
+ extern int RT_SEM_TREE3;
register struct db_i *dbip = DBI_NULL;
register int i;
char **argv;
- static int sem_uses = 0;
if (!sem_uses)
sem_uses = bu_semaphore_register("LIBRT_SEM_USES");
- extern int RT_SEM_WORKER;
if (!RT_SEM_WORKER)
RT_SEM_WORKER = bu_semaphore_register("RT_SEM_WORKER");
- extern int RT_SEM_RESULTS;
if (!RT_SEM_RESULTS)
RT_SEM_RESULTS = bu_semaphore_register("RT_SEM_RESULTS");
- extern int RT_SEM_MODEL;
if (!RT_SEM_MODEL)
RT_SEM_MODEL = bu_semaphore_register("RT_SEM_MODEL");
- extern int RT_SEM_TREE0;
if (!RT_SEM_TREE0)
RT_SEM_TREE0 = bu_semaphore_register("RT_SEM_TREE0");
- extern int RT_SEM_TREE1;
if (!RT_SEM_TREE1)
RT_SEM_TREE1 = bu_semaphore_register("RT_SEM_TREE1");
- extern int RT_SEM_TREE2;
if (!RT_SEM_TREE2)
RT_SEM_TREE2 = bu_semaphore_register("RT_SEM_TREE2");
- extern int RT_SEM_TREE3;
if (!RT_SEM_TREE3)
RT_SEM_TREE3 = bu_semaphore_register("RT_SEM_TREE3");
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
