Revision: 56473
http://sourceforge.net/p/brlcad/code/56473
Author: starseeker
Date: 2013-08-02 15:25:49 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
In order for beset to work with the LOCAL flag (which a recent change rolled in
with NO_INSTALL) it needs to have its build target in the beset subdirectory -
otherwise, the binary output name conflicts with the directory in the gtools
build dir holding the beset information. Should fix the in-src-dir build.
Modified Paths:
--------------
brlcad/trunk/src/gtools/CMakeLists.txt
Added Paths:
-----------
brlcad/trunk/src/gtools/beset/CMakeLists.txt
Modified: brlcad/trunk/src/gtools/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/gtools/CMakeLists.txt 2013-08-02 15:12:56 UTC (rev
56472)
+++ brlcad/trunk/src/gtools/CMakeLists.txt 2013-08-02 15:25:49 UTC (rev
56473)
@@ -5,19 +5,10 @@
${TCLCAD_INCLUDE_DIRS}
${GED_INCLUDE_DIRS}
${PKG_INCLUDE_DIRS}
- ${BRLCAD_SOURCE_DIR}/src/gtools/beset
)
-LIST(REMOVE_DUPLICATES GTOOLS_INCLUDE_DIRS)
+list(REMOVE_DUPLICATES GTOOLS_INCLUDE_DIRS)
include_directories(${GTOOLS_INCLUDE_DIRS})
-set(beset_SRCS
- beset/beset.c
- beset/fitness.c
- beset/population.c
- )
-
-BRLCAD_ADDEXEC(beset "${beset_SRCS}" "libbu;librt;libwdb" NO_INSTALL)
-
BRLCAD_ADDEXEC(g_diff g_diff.c "libtclcad;librt")
BRLCAD_ADDEXEC(g_lint g_lint.c "librt;${M_LIBRARY}")
BRLCAD_ADDEXEC(g_qa g_qa.c "libged;librt")
@@ -26,12 +17,7 @@
BRLCAD_ADDEXEC(g_transfer g_transfer.c "librt;libpkg" NO_INSTALL)
BRLCAD_ADDDATA(g_transfer.c sample_applications)
-set(gtools_ignore_files
- beset/beset.h
- beset/fitness.h
- beset/population.h
- )
-CMAKEFILES(${gtools_ignore_files})
+add_subdirectory(beset)
# Local Variables:
# tab-width: 8
Added: brlcad/trunk/src/gtools/beset/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/gtools/beset/CMakeLists.txt
(rev 0)
+++ brlcad/trunk/src/gtools/beset/CMakeLists.txt 2013-08-02 15:25:49 UTC
(rev 56473)
@@ -0,0 +1,33 @@
+set(BESET_INCLUDE_DIRS
+ ${BU_INCLUDE_DIRS}
+ ${RT_INCLUDE_DIRS}
+ ${WDB_INCLUDE_DIRS}
+ ${TCLCAD_INCLUDE_DIRS}
+ ${GED_INCLUDE_DIRS}
+ ${PKG_INCLUDE_DIRS}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ )
+list(REMOVE_DUPLICATES BESET_INCLUDE_DIRS)
+include_directories(${BESET_INCLUDE_DIRS})
+
+set(beset_SRCS
+ beset.c
+ fitness.c
+ population.c
+ )
+
+BRLCAD_ADDEXEC(beset "${beset_SRCS}" "libbu;librt;libwdb" NO_INSTALL)
+
+set(beset_ignore_files
+ beset.h
+ fitness.h
+ population.h
+ )
+CMAKEFILES(${beset_ignore_files})
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/trunk/src/gtools/beset/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
