Thread: [brlcad-commits] SF.net SVN: brlcad:[34597] brlcad/trunk/src/libged/CMakeLists.txt (Page 2)

brlcad-commits

[brlcad-commits] SF.net SVN: brlcad:[34597] brlcad/trunk/src/libged/CMakeLists.txt

From: <d_r...@us...> - 2009-05-28 07:29:24

Revision: 34597
          http://brlcad.svn.sourceforge.net/brlcad/?rev=34597&view=rev
Author:   d_rossberg
Date:     2009-05-28 07:29:06 +0000 (Thu, 28 May 2009)

Log Message:
-----------
sync with Makefile.am

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2009-05-27 20:53:21 UTC (rev 34596)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2009-05-28 07:29:06 UTC (rev 34597)
@@ -138,9 +138,10 @@
     prcolor.c
     prefix.c
     preview.c
+    protate.c
     ps.c
-    protate.c
     pscale.c
+    ptranslate.c
     push.c
     put.c
     put_comb.c
@@ -164,6 +165,7 @@
     rotate_about.c
     rotate_arb_face.c
     rotate_eto.c
+    rotate_extrude.c
     rotate_hyp.c
     rotate_tgc.c
     rrt.c
@@ -177,6 +179,7 @@
     scale_ell.c
     scale_epa.c
     scale_eto.c
+    scale_extrude.c
     scale_hyp.c
     scale_part.c
     scale_rhc.c
@@ -206,6 +209,8 @@
     tra.c
     trace.c
     track.c
+    translate_extrude.c
+    translate_tgc.c
     tree.c
     typein.c
     unhide.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[35622] brlcad/trunk/src/libged/CMakeLists.txt

From: <d_r...@us...> - 2009-08-19 08:05:49

Revision: 35622
          http://brlcad.svn.sourceforge.net/brlcad/?rev=35622&view=rev
Author:   d_rossberg
Date:     2009-08-19 08:05:39 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
added human.c (sync with Makefile.am)

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2009-08-19 08:03:32 UTC (rev 35621)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2009-08-19 08:05:39 UTC (rev 35622)
@@ -85,6 +85,7 @@
     group.c
     hide.c
     how.c
+    human.c
     illum.c
     importFg4Section.c
     inside.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[39673] brlcad/trunk/src/libged/CMakeLists.txt

From: <d_r...@us...> - 2010-06-23 12:36:08

Revision: 39673
          http://brlcad.svn.sourceforge.net/brlcad/?rev=39673&view=rev
Author:   d_rossberg
Date:     2010-06-23 12:36:00 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
synced with Makefile.am by adding combmem.c to the build

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2010-06-23 03:05:45 UTC (rev 39672)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2010-06-23 12:36:00 UTC (rev 39673)
@@ -35,6 +35,7 @@
     clone.c
     color.c
     comb.c
+    combmem.c
     comb_color.c
     comb_std.c
     concat.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[39965] brlcad/trunk/src/libged/CMakeLists.txt

From: <d_r...@us...> - 2010-07-29 11:03:32

Revision: 39965
          http://brlcad.svn.sourceforge.net/brlcad/?rev=39965&view=rev
Author:   d_rossberg
Date:     2010-07-29 11:03:25 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
synced with Makefile.am

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2010-07-29 05:54:48 UTC (rev 39964)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2010-07-29 11:03:25 UTC (rev 39965)
@@ -196,6 +196,7 @@
     scale_tgc.c
     scale_tor.c
     search.c
+    select.c
     set_output_script.c
     set_transparency.c
     set_uplotOutputMode.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[40100] brlcad/trunk/src/libged/CMakeLists.txt

From: <d_r...@us...> - 2010-08-11 13:38:44

Revision: 40100
          http://brlcad.svn.sourceforge.net/brlcad/?rev=40100&view=rev
Author:   d_rossberg
Date:     2010-08-11 13:38:38 +0000 (Wed, 11 Aug 2010)

Log Message:
-----------
synced with Makefile.am

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2010-08-11 13:37:08 UTC (rev 40099)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2010-08-11 13:38:38 UTC (rev 40100)
@@ -16,6 +16,7 @@
     bigE.c
     blast.c
     bo.c
+    bot.c
     bot_condense.c
     bot_decimate.c
     bot_dump.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[41888] brlcad/trunk/src/libged/CMakeLists.txt

From: <sta...@us...> - 2010-12-30 22:37:40

Revision: 41888
          http://brlcad.svn.sourceforge.net/brlcad/?rev=41888&view=rev
Author:   starseeker
Date:     2010-12-30 22:37:34 +0000 (Thu, 30 Dec 2010)

Log Message:
-----------
Add screengrab.c to trunk CMakeLists.txt file

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2010-12-30 22:28:50 UTC (rev 41887)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2010-12-30 22:37:34 UTC (rev 41888)
@@ -196,6 +196,7 @@
     scale_superell.c
     scale_tgc.c
     scale_tor.c
+	 screengrab.c
     search.c
     select.c
     set_output_script.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[43315] brlcad/trunk/src/libged/CMakeLists.txt

From: <d_r...@us...> - 2011-02-15 12:56:52

Revision: 43315
          http://brlcad.svn.sourceforge.net/brlcad/?rev=43315&view=rev
Author:   d_rossberg
Date:     2011-02-15 12:56:45 +0000 (Tue, 15 Feb 2011)

Log Message:
-----------
there are references to libregex here
added libregex headers search path

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2011-02-15 12:47:44 UTC (rev 43314)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2011-02-15 12:56:45 UTC (rev 43315)
@@ -262,6 +262,7 @@
 include_directories(
     ../../include
     ../other/libpng
+    ../other/libregex
     ../other/libz
     ../other/tcl/generic
     ../other/tcl/win


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[43500] brlcad/trunk/src/libged/CMakeLists.txt

From: <br...@us...> - 2011-02-28 17:04:24

Revision: 43500
          http://brlcad.svn.sourceforge.net/brlcad/?rev=43500&view=rev
Author:   brlcad
Date:     2011-02-28 17:04:17 +0000 (Mon, 28 Feb 2011)

Log Message:
-----------
add fb2pix.c and pix2fb.c

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2011-02-28 16:36:51 UTC (rev 43499)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2011-02-28 17:04:17 UTC (rev 43500)
@@ -69,6 +69,7 @@
     eye.c
     eye_pos.c
     facetize.c
+    fb2pix.c
     find.c
     form.c
     fracture.c
@@ -139,6 +140,7 @@
     pathlist.c
     pathsum.c
     perspective.c
+    pix2fb.c
     plot.c
     pmat.c
     pmodel2view.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[46303] brlcad/trunk/src/libged/CMakeLists.txt

From: <abh...@us...> - 2011-08-19 23:57:21

Revision: 46303
          http://brlcad.svn.sourceforge.net/brlcad/?rev=46303&view=rev
Author:   abhi2011
Date:     2011-08-19 23:57:14 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
Finally, added 1 new .c and 1 .cpp file in libged to the CMake list

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2011-08-19 23:54:51 UTC (rev 46302)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2011-08-19 23:57:14 UTC (rev 46303)
@@ -212,6 +212,8 @@
     shells.c
     showmats.c
     size.c
+    simulate.c
+    simphysics.cpp
     slew.c
     solids_on_ray.c
     sphgroup.c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[46435] brlcad/trunk/src/libged/CMakeLists.txt

From: <sta...@us...> - 2011-08-26 04:01:04

Revision: 46435
          http://brlcad.svn.sourceforge.net/brlcad/?rev=46435&view=rev
Author:   starseeker
Date:     2011-08-26 04:00:57 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
Ah, right - need to format this so that the BRLCAD_ADDLIB macro is OK with it.

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2011-08-26 03:42:50 UTC (rev 46434)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2011-08-26 04:00:57 UTC (rev 46435)
@@ -277,7 +277,7 @@
 		SET(LIBGED_CMD_INCLUDE_DIRS ${LIBGED_CMD_INCLUDE_DIRS} ${${ARGV1}} CACHE INTERNAL "libged cmd includes" FORCE)
 	ENDIF(${ARGV1})
 	IF(${ARGV2})
-		SET(LIBGED_CMD_LIBS ${LIBGED_CMD_LIBS} ${${ARGV2}} CACHE INTERNAL	"libged cmd libs" FORCE)
+		SET(LIBGED_CMD_LIBS_LIST ${LIBGED_CMD_LIBS_LIST} ${${ARGV2}} CACHE INTERNAL	"libged cmd libs" FORCE)
 	ENDIF(${ARGV2})
 ENDMACRO(GED_ADD_CMD)
 
@@ -295,9 +295,12 @@
 	ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${item}/CMakeLists.txt)
 ENDFOREACH(item ${ged_subdirs})
 SET(LIBGED_SOURCES ${LIBGED_SOURCES} ${LIBGED_CMD_SRCS})
-IF(LIBGED_CMD_LIBS)
-	LIST(REMOVE_DUPLICATES LIBGED_CMD_LIBS)
-ENDIF(LIBGED_CMD_LIBS)
+IF(LIBGED_CMD_LIBS_LIST)
+	LIST(REMOVE_DUPLICATES LIBGED_CMD_LIBS_LIST)
+	FOREACH(lib ${LIBGED_CMD_LIBS_LIST})
+		SET(LIBGED_CMD_LIBS "${LIBGED_CMD_LIBS} ${lib}")
+	ENDFOREACH(lib ${LIBGED_CMD_LIBS_LIST})
+ENDIF(LIBGED_CMD_LIBS_LIST)
 IF(LIBGED_CMD_INCLUDE_DIRS)
 	LIST(REMOVE_DUPLICATES LIBGED_CMD_INCLUDE_DIRS)
 ENDIF(LIBGED_CMD_INCLUDE_DIRS)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[46602] brlcad/trunk/src/libged/CMakeLists.txt

From: <sta...@us...> - 2011-09-08 15:48:46

Revision: 46602
          http://brlcad.svn.sourceforge.net/brlcad/?rev=46602&view=rev
Author:   starseeker
Date:     2011-09-08 15:48:36 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
move the macro to the top to avoid an undefined macro error.

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2011-09-08 15:43:55 UTC (rev 46601)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2011-09-08 15:48:36 UTC (rev 46602)
@@ -1,3 +1,23 @@
+
+# Macro for adding commands to libged.  Use in the command subdirectory as follows:
+#
+# GED_ADD_CMD(CMD_SRCS CMD_INCLUDES CMD_LIBS)
+#
+# with the last two arguments being optional.
+MACRO(GED_ADD_CMD sources)
+	get_filename_component(currentdir ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+	FOREACH(srcfile ${${sources}})
+		LIST(APPEND cmd_srcs "${currentdir}/${srcfile}")
+	ENDFOREACH(srcfile ${${sources}})
+	SET(LIBGED_CMD_SRCS ${LIBGED_CMD_SRCS} ${cmd_srcs} CACHE INTERNAL "libged cmd srcs" FORCE)
+	IF(${ARGV1})
+		SET(LIBGED_CMD_INCLUDE_DIRS ${LIBGED_CMD_INCLUDE_DIRS} ${${ARGV1}} CACHE INTERNAL "libged cmd includes" FORCE)
+	ENDIF(${ARGV1})
+	IF(${ARGV2})
+		SET(LIBGED_CMD_LIBS_LIST ${LIBGED_CMD_LIBS_LIST} ${${ARGV2}} CACHE INTERNAL	"libged cmd libs" FORCE)
+	ENDIF(${ARGV2})
+ENDMACRO(GED_ADD_CMD)
+
 # if this subdir stuff is pushed into the actual subdirs, the autoconf vs cmake
 # verification (sh/cmakecheck.sh) will fail on dist-hook.
 IF(BULLET_FOUND)
@@ -274,25 +294,6 @@
     ${SIM_SRCS}
 )
 
-# Macro for adding commands to libged.  Use in the command subdirectory as follows:
-#
-# GED_ADD_CMD(CMD_SRCS CMD_INCLUDES CMD_LIBS)
-#
-# with the last two arguments being optional.
-MACRO(GED_ADD_CMD sources)
-	get_filename_component(currentdir ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-	FOREACH(srcfile ${${sources}})
-		LIST(APPEND cmd_srcs "${currentdir}/${srcfile}")
-	ENDFOREACH(srcfile ${${sources}})
-	SET(LIBGED_CMD_SRCS ${LIBGED_CMD_SRCS} ${cmd_srcs} CACHE INTERNAL "libged cmd srcs" FORCE)
-	IF(${ARGV1})
-		SET(LIBGED_CMD_INCLUDE_DIRS ${LIBGED_CMD_INCLUDE_DIRS} ${${ARGV1}} CACHE INTERNAL "libged cmd includes" FORCE)
-	ENDIF(${ARGV1})
-	IF(${ARGV2})
-		SET(LIBGED_CMD_LIBS_LIST ${LIBGED_CMD_LIBS_LIST} ${${ARGV2}} CACHE INTERNAL	"libged cmd libs" FORCE)
-	ENDIF(${ARGV2})
-ENDMACRO(GED_ADD_CMD)
-
 # Core logic for adding commands to the libged source/lib/include lists.
 FILE(GLOB GED_DIR_CONTENTS ${CMAKE_CURRENT_SOURCE_DIR} *)
 FOREACH(item ${GED_DIR_CONTENTS})

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[46621] brlcad/trunk/src/libged/CMakeLists.txt

From: <sta...@us...> - 2011-09-09 03:27:52

Revision: 46621
          http://brlcad.svn.sourceforge.net/brlcad/?rev=46621&view=rev
Author:   starseeker
Date:     2011-09-09 03:27:44 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
need to ignore the simulate files if we're not building them

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2011-09-09 00:03:41 UTC (rev 46620)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2011-09-09 03:27:44 UTC (rev 46621)
@@ -25,6 +25,7 @@
     SET(SIM_SRCS simulate/simphysics.cpp simulate/simulate.c)
 ELSE(BULLET_FOUND)
     SET(SIM_SRCS "")
+    SET(ged_ignore_files simulate/simphysics.cpp simulate/simulate.c)
 ENDIF(BULLET_FOUND)
 
 set(LIBGED_SOURCES
@@ -330,6 +331,7 @@
 SET_TARGET_PROPERTIES(libged PROPERTIES VERSION 19.0.1 SOVERSION 19)
 
 SET(ged_ignore_files
+	 ${ged_ignore_files}
     ged_private.h
     qray.h
     simulate/simulate.h

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[46871] brlcad/trunk/src/libged/CMakeLists.txt

From: <sta...@us...> - 2011-09-23 14:39:15

Revision: 46871
          http://brlcad.svn.sourceforge.net/brlcad/?rev=46871&view=rev
Author:   starseeker
Date:     2011-09-23 14:39:05 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
Add the opennurbs include dir to libged's include list

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2011-09-23 05:34:37 UTC (rev 46870)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2011-09-23 14:39:05 UTC (rev 46871)
@@ -325,6 +325,7 @@
     ${ZLIB_INCLUDE_DIR}
     ${REGEX_INCLUDE_DIR}
     ${TCL_INCLUDE_DIRS}
+	 ${OPENNURBS_INCLUDE_DIR}
 	 ${LIBGED_CMD_INCLUDE_DIRS}
 )
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[47694] brlcad/trunk/src/libged/CMakeLists.txt

From: <eri...@us...> - 2011-11-29 20:17:12

Revision: 47694
          http://brlcad.svn.sourceforge.net/brlcad/?rev=47694&view=rev
Author:   erikgreenwald
Date:     2011-11-29 20:17:01 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Move FB includes to end to try to shuffle macports include dir out...

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2011-11-29 20:05:24 UTC (rev 47693)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2011-11-29 20:17:01 UTC (rev 47694)
@@ -328,9 +328,9 @@
 	${BRLCAD_SOURCE_DIR}/include
 	${ANALYZE_INCLUDE_DIRS}
 	${BU_INCLUDE_DIRS}
-	${FB_INCLUDE_DIRS}
 	${RT_INCLUDE_DIRS}
 	${WDB_INCLUDE_DIRS}
+	${FB_INCLUDE_DIRS}
 	)
 BRLCAD_INCLUDE_DIRS(GED_INCLUDE_DIRS)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[47718] brlcad/trunk/src/libged/CMakeLists.txt

From: <sta...@us...> - 2011-12-01 02:52:17

Revision: 47718
          http://brlcad.svn.sourceforge.net/brlcad/?rev=47718&view=rev
Author:   starseeker
Date:     2011-12-01 02:52:11 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
Put FB back in alphabetical order - hopefully the sorting logic will handle the situation, if not the 'correct' approach will have to be to disable macports.

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2011-12-01 02:46:31 UTC (rev 47717)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2011-12-01 02:52:11 UTC (rev 47718)
@@ -328,9 +328,9 @@
 	${BRLCAD_SOURCE_DIR}/include
 	${ANALYZE_INCLUDE_DIRS}
 	${BU_INCLUDE_DIRS}
+	${FB_INCLUDE_DIRS}
 	${RT_INCLUDE_DIRS}
 	${WDB_INCLUDE_DIRS}
-	${FB_INCLUDE_DIRS}
 	)
 
 # Local include directories

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[49527] brlcad/trunk/src/libged/CMakeLists.txt

From: <n_...@us...> - 2012-02-23 22:29:54

Revision: 49527
          http://brlcad.svn.sourceforge.net/brlcad/?rev=49527&view=rev
Author:   n_reed
Date:     2012-02-23 22:29:48 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
initialize GED defines

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2012-02-23 22:19:57 UTC (rev 49526)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2012-02-23 22:29:48 UTC (rev 49527)
@@ -352,6 +352,9 @@
 
 BRLCAD_LIB_INCLUDE_DIRS(ged GED_INCLUDE_DIRS GED_LOCAL_INCLUDE_DIRS)
 
+# initialize GED_DEFINES in case of re-configuration
+set(GED_DEFINES "")
+
 if(CPP_DLL_DEFINES)
   add_definitions(-DCLIPPER_DLL_IMPORTS)
 endif(CPP_DLL_DEFINES)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[50340] brlcad/trunk/src/libged/CMakeLists.txt

From: <sta...@us...> - 2012-04-27 04:35:40

Revision: 50340
          http://brlcad.svn.sourceforge.net/brlcad/?rev=50340&view=rev
Author:   starseeker
Date:     2012-04-27 04:35:33 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Presumably we don't actually want to build the headers...

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2012-04-27 02:24:00 UTC (rev 50339)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2012-04-27 04:35:33 UTC (rev 50340)
@@ -26,10 +26,17 @@
 # verification (sh/cmakecheck.sh) will fail on dist-hook.
 if(BULLET_FOUND)
   GED_ADD_CMD(LIBGED_SIM_SOURCES BULLET_INCLUDE_DIR BULLET_LIBRARIES)
-  set(SIM_SRCS simulate/simphysics.cpp simulate/simulate.c simulate/simcollisionalgo.cpp simulate/simutils.h simulate/simutils.c simulate/simrt.c simulate/simrt.h)
+  set(SIM_SRCS 
+    simulate/simphysics.cpp 
+    simulate/simulate.c
+    simulate/simcollisionalgo.cpp 
+    simulate/simutils.c 
+    simulate/simrt.c
+    )
+  CMAKEFILES(simulate/simrt.h simulate/simutils.h)
 else(BULLET_FOUND)
   set(SIM_SRCS "")
-  set(ged_ignore_files simulate/simphysics.cpp simulate/simulate.c simulate/simcollisionalgo.cpp simulate/simcollisionalgo.h simulate/simutils.h simulate/simutils.c simulate/simrt.c simulate/simrt.h)
+  set(ged_ignore_files simulate/simphysics.cpp simulate/simulate.c simulate/simcollisionalgo.cpp simulate/simcollisionalgo.h simulate/simutils.c simulate/simrt.c simulate/simrt.h simulate/simutils.h)
 endif(BULLET_FOUND)
 
 set(LIBGED_SOURCES

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[51198] brlcad/trunk/src/libged/CMakeLists.txt

From: <cp...@us...> - 2012-06-18 01:38:37

Revision: 51198
          http://brlcad.svn.sourceforge.net/brlcad/?rev=51198&view=rev
Author:   cprecup
Date:     2012-06-18 01:38:31 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Add search for libavoid

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2012-06-18 01:36:19 UTC (rev 51197)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2012-06-18 01:38:31 UTC (rev 51198)
@@ -39,6 +39,15 @@
   set(ged_ignore_files simulate/simphysics.cpp simulate/simulate.c simulate/simcollisionalgo.cpp simulate/simcollisionalgo.h simulate/simutils.c simulate/simrt.c simulate/simrt.h simulate/simutils.h)
 endif(BULLET_FOUND)
 
+find_package(ADAPTAGRAMS)
+if(ADAPTAGRAMS_FOUND)
+  set(AVOID_SRCS
+    dag.cpp
+    )
+else(ADAPTAGRMS_FOUND)
+  set(AVOID_SRCS "")
+endif(ADAPTAGRAMS_FOUND)
+
 set(LIBGED_SOURCES
   3ptarb.c
   adc.c

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[51205] brlcad/trunk/src/libged/CMakeLists.txt

From: <cp...@us...> - 2012-06-18 12:19:33

Revision: 51205
          http://brlcad.svn.sourceforge.net/brlcad/?rev=51205&view=rev
Author:   cprecup
Date:     2012-06-18 12:19:27 +0000 (Mon, 18 Jun 2012)
Log Message:
-----------
Fix distcheck error that appears because of SVN_FILE_NOT_IN_BUILD for dag.cpp in the case when the AVOID library is not found.

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2012-06-18 11:54:48 UTC (rev 51204)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2012-06-18 12:19:27 UTC (rev 51205)
@@ -46,6 +46,7 @@
     )
 else(ADAPTAGRMS_FOUND)
   set(AVOID_SRCS "")
+  set(ged_ignore_files ${ged_ignore_files} dag.cpp)
 endif(ADAPTAGRAMS_FOUND)
 
 set(LIBGED_SOURCES
@@ -316,6 +317,7 @@
   zap.c
   zoom/zoom.c
   ${SIM_SRCS}
+  ${AVOID_SRCS}
   )
 
 # Core logic for adding commands to the libged source/lib/include lists.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[51333] brlcad/trunk/src/libged/CMakeLists.txt

From: <cp...@us...> - 2012-06-25 21:08:58

Revision: 51333
          http://brlcad.svn.sourceforge.net/brlcad/?rev=51333&view=rev
Author:   cprecup
Date:     2012-06-25 21:08:52 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
Added special cases for when the Adaptagrams library is found or not found. Don't add dag.cpp to ged_ignore_files if the library is not found; i.e., always compile it.

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2012-06-25 21:05:44 UTC (rev 51332)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2012-06-25 21:08:52 UTC (rev 51333)
@@ -39,15 +39,7 @@
   set(ged_ignore_files simulate/simphysics.cpp simulate/simulate.c simulate/simcollisionalgo.cpp simulate/simcollisionalgo.h simulate/simutils.c simulate/simrt.c simulate/simrt.h simulate/simutils.h)
 endif(BULLET_FOUND)
 
-find_package(ADAPTAGRAMS)
-if(ADAPTAGRAMS_FOUND)
-  set(AVOID_SRCS
-    dag.cpp
-    )
-else(ADAPTAGRMS_FOUND)
-  set(AVOID_SRCS "")
-  set(ged_ignore_files ${ged_ignore_files} dag.cpp)
-endif(ADAPTAGRAMS_FOUND)
+set(AVOID_SRCS dag.cpp)
 
 set(LIBGED_SOURCES
   3ptarb.c
@@ -373,9 +365,17 @@
 endif(CPP_DLL_DEFINES)
 
 if(BULLET_FOUND)
-  BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "libwdb;librt;libfb;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}" NOSTRICTCXX)
+  if(ADAPTAGRAMS_FOUND)
+    BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "libwdb;librt;libfb;libbu;libicv;libanalyze;${AVOID_LIBRARY};${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}" NOSTRICTCXX)
+  else(ADAPTAGRAMS_FOUND)
+    BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "libwdb;librt;libfb;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}" NOSTRICTCXX)
+  endif(ADAPTAGRAMS_FOUND)
 else(BULLET_FOUND)
-  BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "libwdb;librt;libfb;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}")
+  if(ADAPTAGRAMS_FOUND)
+    BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "libwdb;librt;libfb;libbu;libicv;libanalyze;${AVOID_LIBRARY};${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}")
+  else(ADAPTAGRAMS_FOUND)
+    BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "libwdb;librt;libfb;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}")
+  endif(ADAPTAGRAMS_FOUND)
 endif(BULLET_FOUND)
 SET_TARGET_PROPERTIES(libged PROPERTIES VERSION 20.0.1 SOVERSION 20)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[51466] brlcad/trunk/src/libged/CMakeLists.txt

From: <anr...@us...> - 2012-07-12 14:19:03

Revision: 51466
          http://brlcad.svn.sourceforge.net/brlcad/?rev=51466&view=rev
Author:   anrgmrty
Date:     2012-07-12 14:18:52 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
CMakelist including the voxelize file

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2012-07-12 14:18:03 UTC (rev 51465)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2012-07-12 14:18:52 UTC (rev 51466)
@@ -288,6 +288,7 @@
   view2model_vec.c
   view_obj.c
   viewdir.c
+  voxelize.c
   vrot.c
   vutil.c
   wcodes.c

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[52374] brlcad/trunk/src/libged/CMakeLists.txt

From: <br...@us...> - 2012-09-06 19:23:16

Revision: 52374
          http://brlcad.svn.sourceforge.net/brlcad/?rev=52374&view=rev
Author:   brlcad
Date:     2012-09-06 19:23:10 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
undocumented, is there a reason we disable strict if bullet is found?

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2012-09-06 19:21:08 UTC (rev 52373)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2012-09-06 19:23:10 UTC (rev 52374)
@@ -369,9 +369,9 @@
 
 if(BULLET_FOUND)
   if(ADAPTAGRAMS_FOUND)
-    BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "libwdb;librt;libfb;libbu;libicv;libanalyze;${AVOID_LIBRARY};${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}" NOSTRICTCXX)
+    BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "libwdb;librt;libfb;libbu;libicv;libanalyze;${AVOID_LIBRARY};${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}")
   else(ADAPTAGRAMS_FOUND)
-    BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "libwdb;librt;libfb;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}" NOSTRICTCXX)
+    BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}" "libwdb;librt;libfb;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}")
   endif(ADAPTAGRAMS_FOUND)
 else(BULLET_FOUND)
   if(ADAPTAGRAMS_FOUND)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[52406] brlcad/trunk/src/libged/CMakeLists.txt

From: <br...@us...> - 2012-09-09 02:47:49

Revision: 52406
          http://brlcad.svn.sourceforge.net/brlcad/?rev=52406&view=rev
Author:   brlcad
Date:     2012-09-09 02:47:43 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
ignore simulate.h header

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2012-09-08 17:50:53 UTC (rev 52405)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2012-09-09 02:47:43 UTC (rev 52406)
@@ -333,6 +333,7 @@
   wdb_qray.h
   simulate/simcollisionalgo.h 
   simulate/simrt.h 
+  simulate/simulate.h
   simulate/simutils.h
   )
 CMAKEFILES(${ged_ignore_files})

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[52421] brlcad/trunk/src/libged/CMakeLists.txt

From: <car...@us...> - 2012-09-11 18:46:02

Revision: 52421
          http://brlcad.svn.sourceforge.net/brlcad/?rev=52421&view=rev
Author:   carlmoore
Date:     2012-09-11 18:45:56 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
remove trailing blanks/tabs

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2012-09-11 18:44:24 UTC (rev 52420)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2012-09-11 18:45:56 UTC (rev 52421)
@@ -331,8 +331,8 @@
   joint.h
   qray.h
   wdb_qray.h
-  simulate/simcollisionalgo.h 
-  simulate/simrt.h 
+  simulate/simcollisionalgo.h
+  simulate/simrt.h
   simulate/simulate.h
   simulate/simutils.h
   )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[brlcad-commits] SF.net SVN: brlcad:[53279] brlcad/trunk/src/libged/CMakeLists.txt

From: <car...@us...> - 2012-10-23 21:24:14

Revision: 53279
          http://brlcad.svn.sourceforge.net/brlcad/?rev=53279&view=rev
Author:   carlmoore
Date:     2012-10-23 21:24:06 +0000 (Tue, 23 Oct 2012)
Log Message:
-----------
this is the ADAP(T)AGRAMS fix

Modified Paths:
--------------
    brlcad/trunk/src/libged/CMakeLists.txt

Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt	2012-10-23 21:19:58 UTC (rev 53278)
+++ brlcad/trunk/src/libged/CMakeLists.txt	2012-10-23 21:24:06 UTC (rev 53279)
@@ -11,7 +11,7 @@
 endif(BULLET_FOUND)
 
 if(ADAPTAGRAMS_FOUND)
-  set(LIBGED_CMD_LIBS_LIST ${LIBGED_CMD_LIBS_LIST} ${ADAPAGRAMS_LIBRARIES})
+  set(LIBGED_CMD_LIBS_LIST ${LIBGED_CMD_LIBS_LIST} ${ADAPTAGRAMS_LIBRARIES})
   set(LIBGED_CMD_INCLUDE_DIRS ${LIBGED_CMD_INCLUDE_DIRS} ${AVOID_INCLUDE_DIR})
 endif(ADAPTAGRAMS_FOUND)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

<< < 1 2 3 > >> (Page 2 of 3)

Thread: [brlcad-commits] SF.net SVN: brlcad:[34597] brlcad/trunk/src/libged/CMakeLists.txt (Page 2)

Open Source Solid Modeling CAD

brlcad-commits