Revision: 40671
http://brlcad.svn.sourceforge.net/brlcad/?rev=40671&view=rev
Author: davidloman
Date: 2010-09-24 14:04:49 +0000 (Fri, 24 Sep 2010)
Log Message:
-----------
Updated CMakeLists.txt. Added includes for brlcad headers and libs.
Modified Paths:
--------------
rt^3/trunk/tests/GS/CMakeLists.txt
rt^3/trunk/tests/libNet/CMakeLists.txt
Modified: rt^3/trunk/tests/GS/CMakeLists.txt
===================================================================
--- rt^3/trunk/tests/GS/CMakeLists.txt 2010-09-24 14:03:53 UTC (rev 40670)
+++ rt^3/trunk/tests/GS/CMakeLists.txt 2010-09-24 14:04:49 UTC (rev 40671)
@@ -29,13 +29,17 @@
RT3_PROJECT(geometryServiceTests)
#Set Include Dirs
-RT3_PROJECT_ADD_INCLUDE_DIRS( ${QT_INCLUDE_DIRS})
+RT3_PROJECT_ADD_INCLUDE_DIRS(
+ ${QT_INCLUDE_DIR}
+ ${BRLCAD_INC_DIRS}
+)
#Set Libs
RT3_PROJECT_ADD_LIBS(
gs
net
${QT_LIBRARIES}
+ ${_BRLCAD_LIBRARY_pkg}
)
#set Source files
Modified: rt^3/trunk/tests/libNet/CMakeLists.txt
===================================================================
--- rt^3/trunk/tests/libNet/CMakeLists.txt 2010-09-24 14:03:53 UTC (rev
40670)
+++ rt^3/trunk/tests/libNet/CMakeLists.txt 2010-09-24 14:04:49 UTC (rev
40671)
@@ -26,45 +26,6 @@
#
##########################################################################
-RT3_PROJECT(libNetworkTests)
-
-#Set Include Dirs
-RT3_PROJECT_ADD_INCLUDE_DIRS(
- ${QT_INCLUDE_DIR}
- ${BRLCAD_INC_DIRS}
-)
-
-#Set Libs
-RT3_PROJECT_ADD_LIBS(
- net
- utility
- ${QT_LIBRARIES}
-)
-
-#set Source files
-RT3_PROJECT_ADD_SOURCES (
- NetPortalManagerTester.cxx
-)
-
-#Set INST Headers
-RT3_PROJECT_ADD_INST_HEADERS()
-
-#Set NOINST headers
-RT3_PROJECT_ADD_NOINST_HEADERS()
-
-#Set QT INST headers
-RT3_PROJECT_ADD_QT_INST_HEADERS()
-
-#Set QT NOINST headers
-RT3_PROJECT_ADD_QT_NOINST_HEADERS(
- NetPortalManagerTester.h
-)
-
-#Build the project
-#RT3_PROJECT_BUILD_LIB()
-
-##########################################################################
-
RT3_PROJECT(netMsgSerialTest)
#Set Include Dirs
@@ -76,11 +37,14 @@
#Set Libs
RT3_PROJECT_ADD_LIBS(
net
+ pkgcpp
utility
${QT_LIBRARIES}
- ${pkg_LIBRARY}
+ ${_BRLCAD_LIBRARY_pkg}
)
+MESSAGE(STATUS "_BRLCAD_LIBRARY_pkg: ${_BRLCAD_LIBRARY_pkg}")
+
#set Source files
RT3_PROJECT_ADD_SOURCES ( netMsgSerialTest.cxx )
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
