Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[18] trunk/spark
|
From: <he...@us...> - 2008-12-01 20:57:28
|
Revision: 18
http://simspark.svn.sourceforge.net/simspark/?rev=18&view=rev
Author: hedayat
Date: 2008-12-01 20:57:25 +0000 (Mon, 01 Dec 2008)
Log Message:
-----------
Some cleanups
Checking for networking libraries
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/configure.ac
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/lib/salt/CMakeLists.txt
trunk/spark/lib/zeitgeist/CMakeLists.txt
trunk/spark/spark/CMakeLists.txt
trunk/spark/utility/libobj/CMakeLists.txt
trunk/spark/utility/rcssnet/CMakeLists.txt
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2008-12-01 15:04:08 UTC (rev 17)
+++ trunk/spark/CMakeLists.txt 2008-12-01 20:57:25 UTC (rev 18)
@@ -38,14 +38,49 @@
########## check types/functions ##########
include(CheckFunctionExists)
+include(CheckTypeSize)
check_function_exists(strupr HAVE_STRUPR)
-include(CheckTypeSize)
set(CMAKE_REQUIRED_FLAGS "-include sys/socket.h")
check_type_size(socklen_t SOCKLEN_T)
+set(CMAKE_REQUIRED_FLAGS "")
+########## check for required libraries ##########
+include(CheckLibraryExists)
+check_function_exists(socket FUNC_SOCKET_EXISTS)
+if (NOT FUNC_SOCKET_EXISTS)
+ check_library_exists(socket socket "" SOCKET_LIB_REQ)
+ if (SOCKET_LIB_REQ)
+ set(NET_LIBS ${NET_LIBS} socket)
+ endif (SOCKET_LIB_REQ)
+endif (NOT FUNC_SOCKET_EXISTS)
+
+check_function_exists(gethostbyname FUNC_GETHOSTBYNAME_EXISTS)
+if (NOT FUNC_GETHOSTBYNAME_EXISTS)
+ check_library_exists(nsl gethostbyname "" NSL_LIB_REQ)
+ if (NSL_LIB_REQ)
+ set(NET_LIBS ${NET_LIBS} nsl)
+ endif (NSL_LIB_REQ)
+endif (NOT FUNC_GETHOSTBYNAME_EXISTS)
+
+check_function_exists(hstrerror FUNC_HSTRERROR_EXISTS)
+if (NOT FUNC_HSTRERROR_EXISTS)
+ check_library_exists(resolv hstrerror "" RESOLV_LIB_REQ)
+ if (RESOLV_LIB_REQ)
+ set(NET_LIBS ${NET_LIBS} resolv)
+ endif (RESOLV_LIB_REQ)
+endif (NOT FUNC_HSTRERROR_EXISTS)
+
+
########## add extra flags ##########
+set(CMAKE_BUILD_TYPE Debug)
add_definitions(-DHAVE_CONFIG_H)
include_directories(${CMAKE_BINARY_DIR})
+if (UNIX)
+ set(CMAKE_CXX_FLAGS "-Wno-deprecated")
+ set(CMAKE_CXX_FLAGS_DEBUG "-g -W -Wall -Woverloaded-virtual")
+ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+endif (UNIX)
+
set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH
"The directory to install binaries into.")
set(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH
@@ -98,7 +133,7 @@
add_subdirectory(lib)
add_subdirectory(plugin)
add_subdirectory(test)
-#add_subdirectory(doc)
+add_subdirectory(doc)
add_subdirectory(spark)
add_subdirectory(data)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2008-12-01 15:04:08 UTC (rev 17)
+++ trunk/spark/ChangeLog 2008-12-01 20:57:25 UTC (rev 18)
@@ -1,3 +1,18 @@
+2008-12-02 Hedayat Vatankhah <he...@gr...>
+
+ * utility/libobj/CMakeLists.txt:
+ * spark/CMakeLists.txt:
+ * lib/zeitgeist/CMakeLists.txt:
+ * lib/salt/CMakeLists.txt:
+ * lib/kerosin/CMakeLists.txt:
+ * lib/oxygen/CMakeLists.txt:
+ * utility/rcssnet/CMakeLists.txt:
+ - some cleanup
+ - added header files to target's sources (will be added to VS projects)
+
+ * configure.ac:
+ - removed wxutil makefile generation
+
2008-12-01 Hedayat Vatankhah <he...@gr...>
* plugin/soundsystemfmod/CMakeLists.txt:
Modified: trunk/spark/configure.ac
===================================================================
--- trunk/spark/configure.ac 2008-12-01 15:04:08 UTC (rev 17)
+++ trunk/spark/configure.ac 2008-12-01 20:57:25 UTC (rev 18)
@@ -140,7 +140,6 @@
utility/sfsexp/Makefile \
utility/rcssnet/Makefile \
utility/tinyxml/Makefile \
- utility/wxutil/Makefile \
lib/Makefile \
lib/salt/Makefile \
lib/salt/salt-config \
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2008-12-01 15:04:08 UTC (rev 17)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2008-12-01 20:57:25 UTC (rev 18)
@@ -1,3 +1,52 @@
+########### target ###############
+set(kerosin_LIB_HDRS
+ fontserver/font.h
+ fontserver/fontserver.h
+ fontserver/glyph.h
+ imageserver/image.h
+ imageserver/imageserver.h
+ inputserver/inputdevice.h
+ inputserver/inputserver.h
+ inputserver/inputsystem.h
+ inputserver/scancodemap.h
+ inputserver/inputcontrol.h
+ inputserver/inputitem.h
+ inputserver/input.h
+ kerosin.h
+ materialserver/material.h
+ materialserver/materialserver.h
+ sceneserver/axis.h
+ materialserver/material2dtexture.h
+ materialserver/materialexternal.h
+ materialserver/materialsolid.h
+ materialserver/materialexporter.h
+ sceneserver/singlematnode.h
+ sceneserver/light.h
+ sceneserver/sphere.h
+ sceneserver/box.h
+ sceneserver/ccylinder.h
+ sceneserver/cylinder.h
+ sceneserver/staticmesh.h
+ soundserver/soundeffect.h
+ soundserver/soundmodule.h
+ soundserver/soundobject.h
+ soundserver/soundserver.h
+ soundserver/soundstream.h
+ soundserver/soundsystem.h
+ textureserver/texture.h
+ textureserver/texture2d.h
+ textureserver/textureserver.h
+ openglserver/openglwrapper.h
+ openglserver/openglsystem.h
+ openglserver/openglserver.h
+ openglserver/glbase.h
+ renderserver/baserenderserver.h
+ renderserver/renderserver.h
+ renderserver/rendernode.h
+ renderserver/rendercontrol.h
+ renderserver/customrender.h
+)
+
set(kerosin_LIB_SRCS
fontserver/font.cpp
fontserver/fontserver.cpp
@@ -70,10 +119,8 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS}
${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-########### target ###############
+add_library(kerosin SHARED ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
-add_library(kerosin SHARED ${kerosin_LIB_SRCS})
-
target_link_libraries(kerosin ${FREETYPE_LIBRARIES} ${DevIL_LIBRARIES}
${SDL_LIBRARY} ${OPENGL_LIBRARIES})
@@ -93,53 +140,3 @@
GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)
install(DIRECTORY ./ DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME}/kerosin
FILES_MATCHING PATTERN "*.h")
-
-#original Makefile.am contents follow:
-
-#nobase_libpkginclude_HEADERS = \
-#fontserver/font.h \
-#fontserver/fontserver.h \
-#fontserver/glyph.h \
-#imageserver/image.h \
-#imageserver/imageserver.h \
-#inputserver/inputdevice.h \
-#inputserver/inputserver.h \
-#inputserver/inputsystem.h \
-#inputserver/scancodemap.h \
-#inputserver/inputcontrol.h \
-#inputserver/inputitem.h \
-#inputserver/input.h \
-#kerosin.h \
-#materialserver/material.h \
-#materialserver/materialserver.h \
-#sceneserver/axis.h \
-#materialserver/material2dtexture.h \
-#materialserver/materialexternal.h \
-#materialserver/materialsolid.h \
-#materialserver/materialexporter.h \
-#sceneserver/singlematnode.h \
-#sceneserver/light.h \
-#sceneserver/sphere.h \
-#sceneserver/box.h \
-#sceneserver/ccylinder.h \
-#sceneserver/cylinder.h \
-#sceneserver/staticmesh.h \
-#soundserver/soundeffect.h \
-#soundserver/soundmodule.h \
-#soundserver/soundobject.h \
-#soundserver/soundserver.h \
-#soundserver/soundstream.h \
-#soundserver/soundsystem.h \
-#textureserver/texture.h \
-#textureserver/texture2d.h \
-#textureserver/textureserver.h \
-#openglserver/openglwrapper.h \
-#openglserver/openglsystem.h \
-#openglserver/openglserver.h \
-#openglserver/glbase.h \
-#renderserver/baserenderserver.h \
-#renderserver/renderserver.h \
-#renderserver/rendernode.h \
-#renderserver/rendercontrol.h \
-#renderserver/customrender.h
-#
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2008-12-01 15:04:08 UTC (rev 17)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2008-12-01 20:57:25 UTC (rev 18)
@@ -1,3 +1,87 @@
+########### next target ###############
+set(oxygen_LIB_HDRS
+ agentaspect/agentaspect.h
+ agentaspect/effector.h
+ agentaspect/jointeffector.h
+ agentaspect/jointperceptor.h
+ agentaspect/perceptor.h
+ agentaspect/createaction.h
+ controlaspect/controlaspect.h
+ gamecontrolserver/predicate.h
+ gamecontrolserver/gamecontrolserver.h
+ gamecontrolserver/baseparser.h
+ gamecontrolserver/actionobject.h
+ gamecontrolserver/behavior.h
+ oxygen.h
+ physicsserver/body.h
+ physicsserver/bodycontroller.h
+ physicsserver/boxcollider.h
+ physicsserver/ccylindercollider.h
+ physicsserver/collider.h
+ physicsserver/collisionhandler.h
+ physicsserver/contactjointhandler.h
+ physicsserver/odeobject.h
+ physicsserver/odewrapper.h
+ physicsserver/physicsserver.h
+ physicsserver/planecollider.h
+ physicsserver/raycollider.h
+ physicsserver/recorderhandler.h
+ physicsserver/space.h
+ physicsserver/spherecollider.h
+ physicsserver/transformcollider.h
+ physicsserver/world.h
+ physicsserver/dragcontroller.h
+ physicsserver/velocitycontroller.h
+ physicsserver/joint.h
+ physicsserver/balljoint.h
+ physicsserver/hingejoint.h
+ physicsserver/fixedjoint.h
+ physicsserver/sliderjoint.h
+ physicsserver/universaljoint.h
+ physicsserver/hinge2joint.h
+ physicsserver/angularmotor.h
+ sceneserver/sceneimporter.h
+ sceneserver/basenode.h
+ sceneserver/fpscontroller.h
+ sceneserver/scene.h
+ sceneserver/sceneserver.h
+ sceneserver/sceneimporter.h
+ sceneserver/transform.h
+ sceneserver/camera.h
+ sceneserver/scenedict.h
+ simulationserver/simulationserver.h
+ simulationserver/simcontrolnode.h
+ simulationserver/agentcontrol.h
+ simulationserver/monitorcontrol.h
+ simulationserver/monitorlogger.h
+ simulationserver/netcontrol.h
+ simulationserver/netclient.h
+ simulationserver/netmessage.h
+ simulationserver/netbuffer.h
+ simulationserver/traincontrol.h
+ geometryserver/geometryserver.h
+ geometryserver/meshexporter.h
+ geometryserver/meshimporter.h
+ geometryserver/stdmeshimporter.h
+ geometryserver/trimesh.h
+ geometryserver/indexbuffer.h
+ monitorserver/monitorserver.h
+ monitorserver/monitorsystem.h
+ monitorserver/monitoritem.h
+ monitorserver/custommonitor.h
+ monitorserver/monitorcmdparser.h
+)
+if(SPADES_FOUND)
+ set(oxygen_LIB_HDRS
+ ${oxygen_LIB_HDRS}
+ spadesserver/spadesserver.h
+ spadesserver/paramreader.h
+ spadesserver/paramstorer.h
+ spadesserver/spadescreatesenseevent.h
+ spadesserver/spadesactevent.h
+ )
+endif(SPADES_FOUND)
+
set(oxygen_LIB_SRCS
agentaspect/agentaspect.cpp
agentaspect/agentaspect_c.cpp
@@ -135,10 +219,8 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility/)
-########### next target ###############
+add_library(oxygen SHARED ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
-add_library(oxygen SHARED ${oxygen_LIB_SRCS})
-
target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES} ${ODE_LIBRARY})
set_target_properties(oxygen PROPERTIES VERSION ${OXYGEN_VERSION}
@@ -157,86 +239,3 @@
install(DIRECTORY ./ DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME}/oxygen
FILES_MATCHING PATTERN "*.h")
-
-#original Makefile.am contents follow:
-
-#if DEBUG
-#liboxygen_debug_la_CXXFLAGS = -O -g -W -Wall -Woverloaded-virtual -Wno-deprecated
-#else
-#liboxygen_la_CXXFLAGS = -O2 -Wno-deprecated
-#liboxygen_la_LIBADD = -lode $(spades_libs) @BOOST_THREADS_LIB@
-#
-
-#nobase_libpkginclude_HEADERS = \
-#agentaspect/agentaspect.h \
-#agentaspect/effector.h \
-#agentaspect/jointeffector.h \
-#agentaspect/jointperceptor.h \
-#agentaspect/perceptor.h \
-#agentaspect/createaction.h \
-#controlaspect/controlaspect.h \
-#gamecontrolserver/predicate.h \
-#gamecontrolserver/gamecontrolserver.h \
-#gamecontrolserver/baseparser.h \
-#gamecontrolserver/actionobject.h \
-#gamecontrolserver/behavior.h \
-#oxygen.h \
-#physicsserver/body.h \
-#physicsserver/bodycontroller.h \
-#physicsserver/boxcollider.h \
-#physicsserver/ccylindercollider.h \
-#physicsserver/collider.h \
-#physicsserver/collisionhandler.h \
-#physicsserver/contactjointhandler.h \
-#physicsserver/odeobject.h \
-#physicsserver/odewrapper.h \
-#physicsserver/physicsserver.h \
-#physicsserver/planecollider.h \
-#physicsserver/raycollider.h \
-#physicsserver/recorderhandler.h \
-#physicsserver/space.h \
-#physicsserver/spherecollider.h \
-#physicsserver/transformcollider.h \
-#physicsserver/world.h \
-#physicsserver/dragcontroller.h \
-#physicsserver/velocitycontroller.h \
-#physicsserver/joint.h \
-#physicsserver/balljoint.h \
-#physicsserver/hingejoint.h \
-#physicsserver/fixedjoint.h \
-#physicsserver/sliderjoint.h \
-#physicsserver/universaljoint.h \
-#physicsserver/hinge2joint.h \
-#physicsserver/angularmotor.h \
-#sceneserver/sceneimporter.h \
-#sceneserver/basenode.h \
-#sceneserver/fpscontroller.h \
-#sceneserver/scene.h \
-#sceneserver/sceneserver.h \
-#sceneserver/sceneimporter.h \
-#sceneserver/transform.h \
-#sceneserver/camera.h \
-#sceneserver/scenedict.h \
-#simulationserver/simulationserver.h \
-#simulationserver/simcontrolnode.h \
-#simulationserver/agentcontrol.h \
-#simulationserver/monitorcontrol.h \
-#simulationserver/monitorlogger.h \
-#simulationserver/netcontrol.h \
-#simulationserver/netclient.h \
-#simulationserver/netmessage.h \
-#simulationserver/netbuffer.h \
-#simulationserver/traincontrol.h \
-#geometryserver/geometryserver.h \
-#geometryserver/meshexporter.h \
-#geometryserver/meshimporter.h \
-#geometryserver/stdmeshimporter.h \
-#geometryserver/trimesh.h \
-#geometryserver/indexbuffer.h \
-#monitorserver/monitorserver.h \
-#monitorserver/monitorsystem.h \
-#monitorserver/monitoritem.h \
-#monitorserver/custommonitor.h \
-#monitorserver/monitorcmdparser.h \
-#$(spades_headers)
-#
Modified: trunk/spark/lib/salt/CMakeLists.txt
===================================================================
--- trunk/spark/lib/salt/CMakeLists.txt 2008-12-01 15:04:08 UTC (rev 17)
+++ trunk/spark/lib/salt/CMakeLists.txt 2008-12-01 20:57:25 UTC (rev 18)
@@ -1,17 +1,33 @@
+########### target ###############
+set(salt_LIB_HDRS
+ bounds.h
+ fileclasses.h
+ gmath.h
+ path.h
+ random.h
+ salt.h
+ tvector.h
+ defines.h
+ frustum.h
+ matrix.h
+ plane.h
+ rect.h
+ sharedlibrary.h
+ vector.h
+)
+
set(salt_LIB_SRCS
- bounds.cpp
- fileclasses.cpp
- frustum.cpp
- matrix.cpp
- path.cpp
- plane.cpp
- sharedlibrary.cpp
+ bounds.cpp
+ fileclasses.cpp
+ frustum.cpp
+ matrix.cpp
+ path.cpp
+ plane.cpp
+ sharedlibrary.cpp
)
-########### target ###############
+add_library(salt SHARED ${salt_LIB_SRCS} ${salt_LIB_HDRS})
-add_library(salt SHARED ${salt_LIB_SRCS})
-
target_link_libraries(salt libobject)
set_target_properties(salt PROPERTIES VERSION ${SALT_VERSION}
@@ -29,24 +45,3 @@
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)
-#original Makefile.am contents follow:
-
-#if DEBUG
-#libsalt_debug_la_CXXFLAGS = -O -g -W -Wall
-#libsalt_la_CXXFLAGS = -O2
-#
-#libpkginclude_HEADERS = \
-#bounds.h \
-#fileclasses.h \
-#gmath.h \
-#path.h \
-#random.h \
-#salt.h \
-#tvector.h \
-#defines.h \
-#frustum.h \
-#matrix.h \
-#plane.h \
-#rect.h \
-#sharedlibrary.h \
-#vector.h
Modified: trunk/spark/lib/zeitgeist/CMakeLists.txt
===================================================================
--- trunk/spark/lib/zeitgeist/CMakeLists.txt 2008-12-01 15:04:08 UTC (rev 17)
+++ trunk/spark/lib/zeitgeist/CMakeLists.txt 2008-12-01 20:57:25 UTC (rev 18)
@@ -1,3 +1,28 @@
+########### target ###############
+set(zeitgeist_LIB_HDRS
+ class.h
+ core.h
+ corecontext.h
+ leaf.h
+ parameterlist.h
+ node.h
+ object.h
+ object_c.h
+ zeitgeist.h
+ fileserver/fileserver.h
+ fileserver/filesystem.h
+ logserver/logserver.h
+ logserver/logserverstreambuf.h
+ randomserver/randomserver.h
+ scriptserver/gcvalue.h
+ scriptserver/scriptserver.h
+ scriptserver/rubywrapper.h
+
+ #telnetserver/telnetdaemon.h
+ #telnetserver/telnetserver.h
+ #telnetserver/telnetsession.h
+)
+
set(zeitgeist_LIB_SRCS
class.cpp
class_c.cpp
@@ -31,8 +56,7 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${RUBY_INCLUDE_PATH})
-########### target ###############
-add_library(zeitgeist SHARED ${zeitgeist_LIB_SRCS})
+add_library(zeitgeist SHARED ${zeitgeist_LIB_SRCS} ${zeitgeist_LIB_HDRS})
target_link_libraries(zeitgeist ${RUBY_LIBRARY})
@@ -53,27 +77,3 @@
FILES_MATCHING PATTERN "*.h")
-#original Makefile.am contents follow:
-
-#nobase_libpkginclude_HEADERS = \
-#class.h \
-#core.h \
-#corecontext.h \
-#leaf.h \
-#parameterlist.h \
-#node.h \
-#object.h \
-#object_c.h \
-#zeitgeist.h \
-#fileserver/fileserver.h \
-#fileserver/filesystem.h \
-#logserver/logserver.h \
-#logserver/logserverstreambuf.h \
-#randomserver/randomserver.h \
-#scriptserver/gcvalue.h \
-#scriptserver/scriptserver.h \
-#scriptserver/rubywrapper.h
-#
-##telnetserver/telnetdaemon.h \
-##telnetserver/telnetserver.h \
-##telnetserver/telnetsession.h
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2008-12-01 15:04:08 UTC (rev 17)
+++ trunk/spark/spark/CMakeLists.txt 2008-12-01 20:57:25 UTC (rev 18)
@@ -2,6 +2,7 @@
set(spark_LIB_SRCS
spark.cpp
+ spark.h
)
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
@@ -25,18 +26,3 @@
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)
install(FILES spark.h DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME}/spark)
-
-
-
-#original Makefile.am contents follow:
-
-#libspark_debug_la_CXXFLAGS = -O -g -W -Wall
-#libspark_la_LIBADD = @FREETYPE_LIBADD@ @SDL_LIBADD@ @IL_LIBADD@ @GL_LIBADD@
-#bin_SCRIPTS = spark-config
-#
-#AM_CPPFLAGS = -I${top_srcdir}/lib -I${top_srcdir}/utility \
-# @FREETYPE_CPPFLAGS@ @RUBY_CPPFLAGS@ @SDL_CPPFLAGS@
-#
-#
-#nobase_libpkginclude_HEADERS = \
-#spark.h
Modified: trunk/spark/utility/libobj/CMakeLists.txt
===================================================================
--- trunk/spark/utility/libobj/CMakeLists.txt 2008-12-01 15:04:08 UTC (rev 17)
+++ trunk/spark/utility/libobj/CMakeLists.txt 2008-12-01 20:57:25 UTC (rev 18)
@@ -8,17 +8,5 @@
add_library(libobject STATIC ${libobject_STAT_SRCS})
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#noinst_LTLIBRARIES = liblibobject.la
#
-#liblibobject_la_SOURCES = libobj.c
-#
-#liblibobject_la_LIBADD = @LTLIBOBJS@
-#
#EXTRA_DIST = memcmp.c _vsnprintf.c
Modified: trunk/spark/utility/rcssnet/CMakeLists.txt
===================================================================
--- trunk/spark/utility/rcssnet/CMakeLists.txt 2008-12-01 15:04:08 UTC (rev 17)
+++ trunk/spark/utility/rcssnet/CMakeLists.txt 2008-12-01 20:57:25 UTC (rev 18)
@@ -1,18 +1,29 @@
+########### target ###############
+set(rcssnet3D_LIB_HDRS
+ addr.hpp
+ exception.hpp
+ handler.hpp
+ iosocketstream.hpp
+ isocketstream.hpp
+ osocketstream.hpp
+ socket.hpp
+ socketstreambuf.hpp
+ tcpsocket.hpp
+ udpsocket.hpp
+)
-########### next target ###############
-
set(rcssnet3D_LIB_SRCS
- addr.cpp
- exception.cpp
- handler.cpp
- socket.cpp
- tcpsocket.cpp
- udpsocket.cpp
+ addr.cpp
+ exception.cpp
+ handler.cpp
+ socket.cpp
+ tcpsocket.cpp
+ udpsocket.cpp
)
-add_library(rcssnet3D SHARED ${rcssnet3D_LIB_SRCS})
+add_library(rcssnet3D SHARED ${rcssnet3D_LIB_SRCS} ${rcssnet3D_LIB_HDRS})
-target_link_libraries(rcssnet3D)
+target_link_libraries(rcssnet3D ${NET_LIBS})
set_target_properties(rcssnet3D PROPERTIES VERSION ${RCSSNET_VERSION}
SOVERSION ${RCSSNET_SO_VERSION})
@@ -23,23 +34,3 @@
install(DIRECTORY ./ DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME}/rcssnet
FILES_MATCHING PATTERN "*.hpp")
-
-
-
-#original Makefile.am contents follow:
-
-#libpkginclude_HEADERS = \
-#addr.hpp \
-#exception.hpp \
-#handler.hpp \
-#iosocketstream.hpp \
-#isocketstream.hpp \
-#osocketstream.hpp \
-#socket.hpp \
-#socketstreambuf.hpp \
-#tcpsocket.hpp \
-#udpsocket.hpp
-#
-#librcssnet3D_la_LIBADD = @NET_LIBS@
-### define include directory local to the pkgincludedir
-#EXTRA_DIST = README
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
