[brlcad-commits] SF.net SVN: brlcad:[36726]

[<dav...@us...>]

Revision: 36726
          http://brlcad.svn.sourceforge.net/brlcad/?rev=36726&view=rev
Author:   davidloman
Date:     2009-11-30 14:39:43 +0000 (Mon, 30 Nov 2009)

Log Message:
-----------
Rearrange cmake build so that all binaries are generated in one location.

Modified Paths:
--------------
    rt^3/trunk/src/CMakeLists.txt
    rt^3/trunk/src/GS/CMakeLists.txt
    rt^3/trunk/src/iBME/CMakeLists.txt

Removed Paths:
-------------
    rt^3/trunk/src/adminpanel/CMakeLists.txt

Modified: rt^3/trunk/src/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/CMakeLists.txt	2009-11-30 13:37:43 UTC (rev 36725)
+++ rt^3/trunk/src/CMakeLists.txt	2009-11-30 14:39:43 UTC (rev 36726)
@@ -34,5 +34,5 @@
 ADD_SUBDIRECTORY(./GE)
 ADD_SUBDIRECTORY(./GS)
 ADD_SUBDIRECTORY(./iBME)
-ADD_SUBDIRECTORY(./adminpanel)
+#ADD_SUBDIRECTORY(./adminpanel)
 

Modified: rt^3/trunk/src/GS/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/GS/CMakeLists.txt	2009-11-30 13:37:43 UTC (rev 36725)
+++ rt^3/trunk/src/GS/CMakeLists.txt	2009-11-30 14:39:43 UTC (rev 36726)
@@ -94,18 +94,6 @@
 ADD_LIBRARY (gs SHARED ${GS_SOURCES} ${GS_MOCCED_HEADERS})
 TARGET_LINK_LIBRARIES(gs ${QT_LIBRARIES})
 
-
-## Make the GS phase 0 Executable.
-#ADD_EXECUTABLE(gsph0 gsph0.cxx)
-#TARGET_LINK_LIBRARIES(gsph0 ge gs ${QT_LIBRARIES})
-
-## Make the Test Apps.
-ADD_EXECUTABLE(netMsgSerialTest ../tests/netMsgSerialTest.cxx)
-TARGET_LINK_LIBRARIES(netMsgSerialTest ge gs ${QT_LIBRARIES})
-
-
-
-
 MESSAGE(STATUS "Configuring Complete.")
 MESSAGE(STATUS "")
 

Deleted: rt^3/trunk/src/adminpanel/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/adminpanel/CMakeLists.txt	2009-11-30 13:37:43 UTC (rev 36725)
+++ rt^3/trunk/src/adminpanel/CMakeLists.txt	2009-11-30 14:39:43 UTC (rev 36726)
@@ -1,70 +0,0 @@
-#########################################################################
-#
-#	BRL-CAD
-#	
-#	Copyright (c) 1997-2009 United States Government as represented by
-#	the U.S. Army Research Laboratory.
-#	
-#	This library is free software; you can redistribute it and/or
-#	modify it under the terms of the GNU Lesser General Public License
-#	version 2.1 as published by the Free Software Foundation.
-#	
-#	This library is distributed in the hope that it will be useful, but
-#	WITHOUT ANY WARRANTY; without even the implied warranty of
-#	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#	Lesser General Public License for more details.
-#	
-#	You should have received a copy of the GNU Lesser General Public
-#	License along with this file; see the file named COPYING for more
-#	information.
-#	
-#########################################################################
-#	@file rt^3/src/adminpanel/CMakeLists.txt
-#
-#	$Revision:  $
-#	$Author:  $
-#
-##########################################################################
-
-MESSAGE(STATUS "")
-MESSAGE(STATUS "################################################")
-MESSAGE(STATUS "##      Configuring AdminControlPanel         ##")
-MESSAGE(STATUS "################################################")
-MESSAGE(STATUS "")
-
-PROJECT(acp)
-
-IF(COMMAND cmake_policy)
-	cmake_policy(SET CMP0003 NEW)
-ENDIF(COMMAND cmake_policy)
-
-INCLUDE_DIRECTORIES (${RT3_INCLUDE_DIR} ${QT_INCLUDE_DIR})
-MESSAGE(STATUS "Include Directories: ${RT3_INCLUDE_DIR} ${QT_INCLUDE_DIR}")
-
-
-INCLUDE (${QT_USE_FILE})
-SET (QT_USE_QTNETWORK TRUE)
-
-
-set(ACP_SOURCES
-	acpMain.cxx
-	AdminControlPanel.cxx
-	CommandParser.cxx
-)
-
-set(ACP_HEADERS
-	ICommandable.h
-)
-
-set(ACP_PREMOC_HEADERS
-	AdminControlPanel.h
-	CommandParser.h
-)
-
-qt4_wrap_cpp(ACP_POSTMOC_HEADERS ${ACP_PREMOC_HEADERS})
-
-ADD_EXECUTABLE (acp ${ACP_HEADERS} ${ACP_POSTMOC_HEADERS} ${ACP_SOURCES})
-TARGET_LINK_LIBRARIES(acp ${QT_LIBRARIES})
-
-MESSAGE(STATUS "Configuring Complete.")
-MESSAGE(STATUS "")

Modified: rt^3/trunk/src/iBME/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/iBME/CMakeLists.txt	2009-11-30 13:37:43 UTC (rev 36725)
+++ rt^3/trunk/src/iBME/CMakeLists.txt	2009-11-30 14:39:43 UTC (rev 36726)
@@ -51,8 +51,55 @@
 TARGET_LINK_LIBRARIES(dataStreamTest ge)
 
 
-#ADD_EXECUTABLE(netMsgSerialTest ../tests/netMsgSerialTest.cxx)
-#TARGET_LINK_LIBRARIES(netMsgSerialTest ge gs ${QT_LIBRARIES})
+## Make the GS phase 0 Executable.
+#ADD_EXECUTABLE(gsph0 gsph0.cxx)
+#TARGET_LINK_LIBRARIES(gsph0 ge gs ${QT_LIBRARIES})
 
+
+## Make the Test Apps.
+ADD_EXECUTABLE(netMsgSerialTest ../tests/netMsgSerialTest.cxx)
+TARGET_LINK_LIBRARIES(netMsgSerialTest ge gs ${QT_LIBRARIES})
+
+
 MESSAGE(STATUS "Configuring Complete.")
 MESSAGE(STATUS "")
+
+
+
+MESSAGE(STATUS "")
+MESSAGE(STATUS "################################################")
+MESSAGE(STATUS "##      Configuring AdminControlPanel         ##")
+MESSAGE(STATUS "################################################")
+MESSAGE(STATUS "")
+
+PROJECT(acp)
+
+INCLUDE_DIRECTORIES (${RT3_INCLUDE_DIR} ${QT_INCLUDE_DIR})
+MESSAGE(STATUS "Include Directories: ${RT3_INCLUDE_DIR} ${QT_INCLUDE_DIR}")
+
+INCLUDE (${QT_USE_FILE})
+SET (QT_USE_QTNETWORK TRUE)
+
+set(ACP_SOURCES
+	../adminpanel/acpMain.cxx
+	../adminpanel/AdminControlPanel.cxx
+	../adminpanel/CommandParser.cxx
+)
+
+set(ACP_HEADERS
+	../adminpanel/ICommandable.h
+)
+
+set(ACP_PREMOC_HEADERS
+	../adminpanel/AdminControlPanel.h
+	../adminpanel/CommandParser.h
+)
+
+qt4_wrap_cpp(ACP_POSTMOC_HEADERS ${ACP_PREMOC_HEADERS})
+
+ADD_EXECUTABLE (acp ${ACP_HEADERS} ${ACP_POSTMOC_HEADERS} ${ACP_SOURCES})
+TARGET_LINK_LIBRARIES(acp ${QT_LIBRARIES})
+
+MESSAGE(STATUS "Configuring Complete.")
+MESSAGE(STATUS "")
+


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