[brlcad-commits] SF.net SVN: brlcad:[43415] brlcad/branches/cmake
Revision: 43415
http://brlcad.svn.sourceforge.net/brlcad/?rev=43415view=rev
Author: starseeker
Date: 2011-02-18 13:38:49 + (Fri, 18 Feb 2011)
Log Message:
---
We don't want any of the CFLAGS being added to the BRL-CAD build to make it to
src/other - from what I'm seeing on the CMake list the correct way to do this
seems to be adding the src/other subdirectory before any CFLAGS are set at the
top level. This also means that the src/other CMakeLists.txt files have to
'stand on their own' a bit more than before - i.e. they can't depend on the
toplevel settings to give them what they need. This is fine (indeed it's the
right way to do it) but jove in particular isn't a proper stand-alone
subconfigure yet and some of the others probably need tweaking. Hopefully this
will build - currently stops with ntohl not being defined, which is unrelated.
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/CMakeLists.txt
brlcad/branches/cmake/src/other/CMakeLists.txt
brlcad/branches/cmake/src/other/togl/CMake/CheckFunctions.cmake
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-02-18 04:54:38 UTC (rev
43414)
+++ brlcad/branches/cmake/CMakeLists.txt2011-02-18 13:38:49 UTC (rev
43415)
@@ -822,6 +822,19 @@
FIND_PROGRAM(DTRACE_EXEC NAMES dtrace DOC path to dtrace executable)
ENDIF(BRLCAD-ENABLE_DTRACE)
+
+# Load various wrapper macros for checking libraries, headers and
+# functions
+INCLUDE(${BRLCAD_CMAKE_DIR}/BRLCAD_CheckFunctions.cmake)
+
+# The src/other subdirectory does not share (at least, not universally)
+# certain definitions common to all other directories in BRL-CAD. Also,
+# we don't want flags that are otherwise global to BRL-CAD to be passed
+# to the src/other directory (particularly things like strict compiler
+# flags) so add src/other before any of that setup occurs.
+ADD_SUBDIRECTORY(src/other)
+
+
# ***
# ***Check for Libraries - Stage 3 of 9 ***
# ***
@@ -835,10 +848,6 @@
# TODO - need to make LINKOPT vars for anything here that will
# be referenced in a pkgconfig file
-# Load various wrapper macros for checking libraries, headers and
-# functions
-INCLUDE(${BRLCAD_CMAKE_DIR}/BRLCAD_CheckFunctions.cmake)
-
# Look for threads (doesn't check for headers)
# The variable CMAKE_THREAD_LIBS_INIT is the one of interest
# when writing target_link_libraries lists.
Modified: brlcad/branches/cmake/src/CMakeLists.txt
===
--- brlcad/branches/cmake/src/CMakeLists.txt2011-02-18 04:54:38 UTC (rev
43414)
+++ brlcad/branches/cmake/src/CMakeLists.txt2011-02-18 13:38:49 UTC (rev
43415)
@@ -1,12 +1,5 @@
# Minimal directories required for any BRL-CAD functionality
-# The other subdirectory does not share (at least, not universally)
-# certain definitions common to all other directories in BRL-CAD,
-# so add this first. It is always on in any case, and if any src/other
-# directory requires BRL-CAD specific directories or definitions they
-# will need to call them out explicitly
-ADD_SUBDIRECTORY(other)
-
# Define some common definitions and includes here that are used
# in all BRL-CAD builds
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2011-02-18 04:54:38 UTC
(rev 43414)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2011-02-18 13:38:49 UTC
(rev 43415)
@@ -1,3 +1,8 @@
+include_directories(
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ )
+
#-
# Load some CMake macros to handle the special case of third party libraries.
INCLUDE(${BRLCAD_CMAKE_DIR}/ThirdParty.cmake)
@@ -4,7 +9,7 @@
# Quiet all warnings in this directory
IF(BRLCAD-DISABLE_SRC_OTHER_WARN)
- add_definitions(-w)
+ #add_definitions(-w)
ENDIF(BRLCAD-DISABLE_SRC_OTHER_WARN)
#-
@@ -1040,27 +1045,27 @@
# it's not worth trying to make it do so. Defaults to
# on if BRLCAD-ENABLE_ALL_LOCAL_LIBS is enabled before
# the first run of CMake, otherwise defaults to off.
-IF(BRLCAD-ENABLE_JOVE)
- IF(NOT WIN32)
- ADD_SUBDIRECTORY(jove)
- SET(jove_ignore_files
- BUGS
- README
- describe.com
- jove-tutorial
- jove.1
- jove.emacs
- jove.h
-
[brlcad-commits] SF.net SVN: brlcad:[43416] brlcad/branches/cmake/CMakeLists.txt
Revision: 43416 http://brlcad.svn.sourceforge.net/brlcad/?rev=43416view=rev Author: starseeker Date: 2011-02-18 13:40:57 + (Fri, 18 Feb 2011) Log Message: --- Need arpa/inet.h test Modified Paths: -- brlcad/branches/cmake/CMakeLists.txt Modified: brlcad/branches/cmake/CMakeLists.txt === --- brlcad/branches/cmake/CMakeLists.txt2011-02-18 13:38:49 UTC (rev 43415) +++ brlcad/branches/cmake/CMakeLists.txt2011-02-18 13:40:57 UTC (rev 43416) @@ -989,6 +989,7 @@ BRLCAD_INCLUDE_FILE(dirent.h HAVE_DIRENT_H) # Need to compare this with the configure.ac list +BRLCAD_INCLUDE_FILE(arpa/inet.h HAVE_ARPA_INET_H) BRLCAD_INCLUDE_FILE(dlfcn.h HAVE_DLFCN_H) BRLCAD_INCLUDE_FILE(dslib.h HAVE_DSLIB_H) BRLCAD_INCLUDE_FILE(getopt.h HAVE_GETOPT_H) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43417] brlcad/branches/cmake/CMakeLists.txt
Revision: 43417
http://brlcad.svn.sourceforge.net/brlcad/?rev=43417view=rev
Author: starseeker
Date: 2011-02-18 14:21:04 + (Fri, 18 Feb 2011)
Log Message:
---
initialize CFLAGS like we mean it
Modified Paths:
--
brlcad/branches/cmake/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===
--- brlcad/branches/cmake/CMakeLists.txt2011-02-18 13:40:57 UTC (rev
43416)
+++ brlcad/branches/cmake/CMakeLists.txt2011-02-18 14:21:04 UTC (rev
43417)
@@ -1079,8 +1079,8 @@
# *** Check for Compile Characteristics - Stage 6 of 9 ***
# ***
-SET(${CMAKE_C_FLAGS} )
-SET(${CMAKE_CXX_FLAGS} )
+SET(CMAKE_C_FLAGS CACHE STRING compiler flags FORCE)
+SET(CMAKE_CXX_FLAGS CACHE STRING cxx compiler flags FORCE)
INCLUDE(${BRLCAD_CMAKE_DIR}/CompilerFlags.cmake)
# ***
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43418] brlcad/trunk/src/libtclcad/ged_obj.c
Revision: 43418 http://brlcad.svn.sourceforge.net/brlcad/?rev=43418view=rev Author: bob1961 Date: 2011-02-18 16:43:57 + (Fri, 18 Feb 2011) Log Message: --- Minor tweak to go_refresh_view(). Modified Paths: -- brlcad/trunk/src/libtclcad/ged_obj.c Modified: brlcad/trunk/src/libtclcad/ged_obj.c === --- brlcad/trunk/src/libtclcad/ged_obj.c2011-02-18 14:21:04 UTC (rev 43417) +++ brlcad/trunk/src/libtclcad/ged_obj.c2011-02-18 16:43:57 UTC (rev 43418) @@ -9012,7 +9012,9 @@ fb_refresh(gdvp-gdv_fbs.fbs_fbp, gdvp-gdv_view-gv_rect.grs_pos[X], gdvp-gdv_view-gv_rect.grs_pos[Y], gdvp-gdv_view-gv_rect.grs_dim[X], gdvp-gdv_view-gv_rect.grs_dim[Y]); - dm_draw_rect(gdvp-gdv_dmp, gdvp-gdv_view-gv_rect); + + if (gdvp-gdv_view-gv_rect.grs_line_width) + dm_draw_rect(gdvp-gdv_dmp, gdvp-gdv_view-gv_rect); } else fb_refresh(gdvp-gdv_fbs.fbs_fbp, 0, 0, gdvp-gdv_dmp-dm_width, gdvp-gdv_dmp-dm_height); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb ___ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43420] brlcad/trunk/src/gtools/remapid.c
Revision: 43420
http://brlcad.svn.sourceforge.net/brlcad/?rev=43420view=rev
Author: erikgreenwald
Date: 2011-02-18 19:00:59 + (Fri, 18 Feb 2011)
Log Message:
---
remove function defined as static but never used
Modified Paths:
--
brlcad/trunk/src/gtools/remapid.c
Modified: brlcad/trunk/src/gtools/remapid.c
===
--- brlcad/trunk/src/gtools/remapid.c 2011-02-18 17:09:59 UTC (rev 43419)
+++ brlcad/trunk/src/gtools/remapid.c 2011-02-18 19:00:59 UTC (rev 43420)
@@ -190,27 +190,6 @@
/*
- * Diagnostic routine to print out the contents of a struct remapid_file
- */
-HIDDEN void
-remapid_printfile(REMAPID_FILE *bfp)
-{
-BU_CK_FILE(bfp);
-
-bu_log(File '%s'...\n, bfp-file_name);
-bu_log( ptr %x\n, bfp-file_ptr);
-bu_log( buf '%s'\n, bu_vls_addr((bfp-file_buf)));
-bu_log( bp %d, bfp-file_bp - bu_vls_addr((bfp-file_buf)));
-bu_log(: '%c' (%03o)\n, *(bfp-file_bp), *(bfp-file_bp));
-bu_log( needline %d\n, bfp-file_needline);
-bu_log( linenm %d\n, bfp-file_linenm);
-bu_log( comment '%c' (%d)\n,
- bfp-file_comment, bfp-file_comment);
-bu_log( buflen %d\n, bfp-file_buflen);
-}
-
-
-/*
* Print out a syntax error message about a REMAPID_FILE
*/
void
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
[brlcad-commits] SF.net SVN: brlcad:[43421] brlcad/trunk/src
Revision: 43421
http://brlcad.svn.sourceforge.net/brlcad/?rev=43421view=rev
Author: erikgreenwald
Date: 2011-02-18 19:11:58 + (Fri, 18 Feb 2011)
Log Message:
---
warning quellage
Modified Paths:
--
brlcad/trunk/src/gtools/g_diff.c
brlcad/trunk/src/libmultispectral/sh_temp.c
brlcad/trunk/src/mged/points/points_parse.y
brlcad/trunk/src/proc-db/tube.c
brlcad/trunk/src/remrt/remrt.c
brlcad/trunk/src/rt/main.c
brlcad/trunk/src/rt/viewpp.c
brlcad/trunk/src/rttherm/ssampview.c
Modified: brlcad/trunk/src/gtools/g_diff.c
===
--- brlcad/trunk/src/gtools/g_diff.c2011-02-18 19:00:59 UTC (rev 43420)
+++ brlcad/trunk/src/gtools/g_diff.c2011-02-18 19:11:58 UTC (rev 43421)
@@ -185,7 +185,7 @@
}
if (ext1.ext_nbytes != ext2.ext_nbytes) {
- printf(Byte counts are different on %s (%ld != %ld)\n, dp1-d_namep,
ext1.ext_nbytes, ext2.ext_nbytes);
+ printf(Byte counts are different on %s (%ld != %ld)\n, dp1-d_namep,
(long int)ext1.ext_nbytes, (long int)ext2.ext_nbytes);
kill = 1;
}
Modified: brlcad/trunk/src/libmultispectral/sh_temp.c
===
--- brlcad/trunk/src/libmultispectral/sh_temp.c 2011-02-18 19:00:59 UTC (rev
43420)
+++ brlcad/trunk/src/libmultispectral/sh_temp.c 2011-02-18 19:11:58 UTC (rev
43421)
@@ -39,7 +39,6 @@
HIDDEN int temp_setup(register struct region *rp, struct bu_vls *matparm,
char **dpp, const struct mfuncs *mfp, struct rt_i *rtip), temp_render(struct
application *ap, struct partition *pp, struct shadework *swp, char *dp);
HIDDEN voidtemp_print(register struct region *rp), temp_free(char *cp);
-HIDDEN voidtemp_transp_hook();
extern int mlib_zero(), mlib_one();
extern voidmlib_void();
Modified: brlcad/trunk/src/mged/points/points_parse.y
===
--- brlcad/trunk/src/mged/points/points_parse.y 2011-02-18 19:00:59 UTC (rev
43420)
+++ brlcad/trunk/src/mged/points/points_parse.y 2011-02-18 19:11:58 UTC (rev
43421)
@@ -209,9 +209,9 @@
yyerror(char *msg)
{
if (get_column() == 0) {
- printf(\nERROR: Unexpected end of line reached on line %ld, column %ld
(file offset %ld)\n, get_lines(), strlen(previous_linebuffer)+1, get_bytes());
+ printf(\nERROR: Unexpected end of line reached on line %ld, column %ld
(file offset %ld)\n, get_lines(), (long int)strlen(previous_linebuffer)+1,
get_bytes());
printf(%s\n%*s\n, previous_linebuffer,
(int)strlen(previous_linebuffer)+1, ^);
- fprintf(stderr, ERROR: Unexpected end of line reached on line %ld,
column %ld (file offset %ld)\n, get_lines(), strlen(previous_linebuffer)+1,
get_bytes());
+ fprintf(stderr, ERROR: Unexpected end of line reached on line %ld,
column %ld (file offset %ld)\n, get_lines(), (long
int)strlen(previous_linebuffer)+1, get_bytes());
} else {
printf(\nERROR: Unexpected input on line %ld, column %ld (file offset
%ld)\n, get_lines()+1, get_column()-1, get_bytes());
printf(%s\n%*s\n, linebuffer, (int)get_column()-1, ^);
Modified: brlcad/trunk/src/proc-db/tube.c
===
--- brlcad/trunk/src/proc-db/tube.c 2011-02-18 19:00:59 UTC (rev 43420)
+++ brlcad/trunk/src/proc-db/tube.c 2011-02-18 19:11:58 UTC (rev 43421)
@@ -412,7 +412,7 @@
nmass = (size_t)nmassval;
if (nmass-1 != nsamples) {
fprintf(stderr, nmass %lu / nsamples %lu mismatch\n,
- nmass, nsamples);
+ (unsigned long)nmass, (unsigned long)nsamples);
return -1;
}
#define EXAGERATION (4 * oradius)
Modified: brlcad/trunk/src/remrt/remrt.c
===
--- brlcad/trunk/src/remrt/remrt.c 2011-02-18 19:00:59 UTC (rev 43420)
+++ brlcad/trunk/src/remrt/remrt.c 2011-02-18 19:11:58 UTC (rev 43421)
@@ -575,10 +575,10 @@
/* Go until no more clients */
/* Aargh. We really need a FD_ISZERO macro. */
- for ( i = 0, done = 1; i FD_SETSIZE; i++)
+ for ( i = 0, done = 1; i (int)FD_SETSIZE; i++)
if (FD_ISSET(i, clients)) { done = 0; break; }
while ( !done ) {
- for ( i = 0, done = 1; i FD_SETSIZE; i++)
+ for ( i = 0, done = 1; i (int)FD_SETSIZE; i++)
if (FD_ISSET(i, clients)) { done = 0; break; }
do_work(0); /* no auto starting of servers */
}
@@ -671,7 +671,7 @@
} else {
/* Aargh. We really need a FD_ISZERO macro. */
int done, i;
- for ( i = 0, done = 1; i FD_SETSIZE; i++)
+ for ( i = 0, done = 1; i (int)FD_SETSIZE; i++)
if (FD_ISSET(i, clients)) { done = 0; break; }
if (done) break;
}
@@ -738,7 +738,7 @@
intval;
[brlcad-commits] SF.net SVN: brlcad:[43422] geomcore/trunk/tests/CMakeLists.txt
Revision: 43422
http://brlcad.svn.sourceforge.net/brlcad/?rev=43422view=rev
Author: erikgreenwald
Date: 2011-02-18 19:18:48 + (Fri, 18 Feb 2011)
Log Message:
---
park tests in a seperate directory
Modified Paths:
--
geomcore/trunk/tests/CMakeLists.txt
Modified: geomcore/trunk/tests/CMakeLists.txt
===
--- geomcore/trunk/tests/CMakeLists.txt 2011-02-18 19:11:58 UTC (rev 43421)
+++ geomcore/trunk/tests/CMakeLists.txt 2011-02-18 19:18:48 UTC (rev 43422)
@@ -31,6 +31,8 @@
${CMAKE_CURRENT_BINARY_DIR}/../src/other/uuid
)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${GEOMCORE_BINARY_DIR}/tests-bin CACHE
INTERNAL Single output directory for building all test executables.)
+
ADD_SUBDIRECTORY(libNet)
ADD_SUBDIRECTORY(GE)
ADD_SUBDIRECTORY(GS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
___
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
