Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[52] trunk
|
From: <tk...@us...> - 2009-03-05 13:43:03
|
Revision: 52
http://simspark.svn.sourceforge.net/simspark/?rev=52&view=rev
Author: tknrkb
Date: 2009-03-05 13:42:41 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
Cmake OSX suppot.
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/cmake/FindSpark.cmake
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
trunk/rcssserver3d/simspark/CMakeLists.txt
trunk/rcssserver3d/simspark/main.cpp
trunk/spark/CMakeLists.txt
trunk/spark/lib/CMakeLists.txt
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/lib/salt/CMakeLists.txt
trunk/spark/lib/salt/fileclasses.cpp
trunk/spark/lib/zeitgeist/CMakeLists.txt
trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
trunk/spark/plugin/CMakeLists.txt
trunk/spark/plugin/collisionperceptor/CMakeLists.txt
trunk/spark/plugin/filesystemrar/CMakeLists.txt
trunk/spark/plugin/filesystemstd/CMakeLists.txt
trunk/spark/plugin/filesystemzip/CMakeLists.txt
trunk/spark/plugin/forceeffector/CMakeLists.txt
trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt
trunk/spark/plugin/imageperceptor/CMakeLists.txt
trunk/spark/plugin/imageperceptor/imageperceptor.cpp
trunk/spark/plugin/inputsdl/CMakeLists.txt
trunk/spark/plugin/inputwx/CMakeLists.txt
trunk/spark/plugin/objimporter/CMakeLists.txt
trunk/spark/plugin/openglsyssdl/CMakeLists.txt
trunk/spark/plugin/openglsyswx/CMakeLists.txt
trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt
trunk/spark/plugin/rosimporter/CMakeLists.txt
trunk/spark/plugin/rubysceneimporter/CMakeLists.txt
trunk/spark/plugin/sceneeffector/CMakeLists.txt
trunk/spark/plugin/sexpparser/CMakeLists.txt
trunk/spark/plugin/soundsystembass/CMakeLists.txt
trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
trunk/spark/plugin/sparkagent/CMakeLists.txt
trunk/spark/plugin/sparkmonitor/CMakeLists.txt
trunk/spark/spark/CMakeLists.txt
trunk/spark/test/CMakeLists.txt
trunk/spark/utility/CMakeLists.txt
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -12,10 +12,13 @@
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
find_package(Spark REQUIRED)
find_package(Freetype REQUIRED)
+find_package(Boost REQUIRED)
+find_package(OpenGL REQUIRED)
+find_package(SDL REQUIRED)
########## add extra flags ##########
add_definitions(-DHAVE_CONFIG_H)
-include_directories(${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
STRING "Common C++ compiler flags" FORCE)
Modified: trunk/rcssserver3d/cmake/FindSpark.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindSpark.cmake 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/cmake/FindSpark.cmake 2009-03-05 13:42:41 UTC (rev 52)
@@ -17,6 +17,9 @@
# KEROSIN_INCLUDE_DIR - where to find kerosin include files
# KEROSIN_LIBRARIES - List of libraries when using kerosin.
# KEROSIN_FOUND - True if kerosin found.
+# RCSSNET3D_INCLUDE_DIR - where to find kerosin include files
+# RCSSNET3D_LIBRARIES - List of libraries when using kerosin.
+# RCSSNET3D_FOUND - True if kerosin found.
# Spark section
IF (SPARK_INCLUDE_DIR)
@@ -143,3 +146,28 @@
ENDIF(KEROSIN_FOUND)
MARK_AS_ADVANCED( KEROSIN_LIBRARY KEROSIN_INCLUDE_DIR )
+
+# rcssnet3D
+IF (RCSSNET3D_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(RCSSNET3D_FIND_QUIETLY TRUE)
+ENDIF (RCSSNET3D_INCLUDE_DIR)
+
+FIND_PATH(RCSSNET3D_INCLUDE_DIR rcssnet/addr.hpp PATH_SUFFIXES simspark)
+
+SET(RCSSNET3D_NAMES rcssnet3D rcssnet3D_debug)
+FIND_LIBRARY(RCSSNET3D_LIBRARY NAMES ${RCSSNET3D_NAMES} PATH_SUFFIXES simspark )
+
+# handle the QUIETLY and REQUIRED arguments and set RCSSNET3D_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(RCSSNET3D DEFAULT_MSG RCSSNET3D_LIBRARY
+ RCSSNET3D_INCLUDE_DIR)
+
+IF(RCSSNET3D_FOUND)
+ SET( RCSSNET3D_LIBRARIES ${RCSSNET3D_LIBRARY} )
+ELSE(RCSSNET3D_FOUND)
+ SET( RCSSNET3D_LIBRARIES )
+ENDIF(RCSSNET3D_FOUND)
+
+MARK_AS_ADVANCED( RCSSNET3D_LIBRARY RCSSNET3D_INCLUDE_DIR )
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -115,7 +115,13 @@
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
-target_link_libraries(soccer)
+if (APPLE)
+ target_link_libraries(soccer ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${OPENGL_gl_LIBRARY})
+else (APPLE)
+ target_link_libraries(soccer)
+endif (APPLE)
set_target_properties(soccer PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccer DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -25,7 +25,12 @@
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
-target_link_libraries(soccermonitor)
+if (APPLE)
+ target_link_libraries(soccermonitor ${SALT_LIBRARIES} ${OXYGEN_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${KEROSIN_LIBRARIES})
+else (APPLE)
+ target_link_libraries(soccermonitor)
+endif (APPLE)
set_target_properties(soccermonitor PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS soccermonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -18,9 +18,15 @@
add_executable(rcssagent3d ${rcssagent3d_SRCS})
-target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
-
+if (APPLE)
+ target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${RCSSNET3D_LIBRARIES})
+else (APPLE)
+ target_link_libraries(rcssagent3d ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+endif (APPLE)
+
set_target_properties(rcssagent3d PROPERTIES
INSTALL_RPATH "${RPATH_DIRECTORIES}")
install(TARGETS rcssagent3d DESTINATION ${BINDIR})
Modified: trunk/rcssserver3d/simspark/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/simspark/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/simspark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -4,14 +4,26 @@
main.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
add_executable(simspark ${simspark_SRCS})
-target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
- ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+if (APPLE)
+ include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
+ ${SDL_INCLUDE_DIR})
+ target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
+ ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
+else (APPLE)
+ include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
+ ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
+
+ target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
+ ${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES})
+endif (APPLE)
+
+
+
set_target_properties(simspark PROPERTIES INSTALL_RPATH "${RPATH_DIRECTORIES}")
install(TARGETS simspark DESTINATION ${BINDIR})
Modified: trunk/rcssserver3d/simspark/main.cpp
===================================================================
--- trunk/rcssserver3d/simspark/main.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/rcssserver3d/simspark/main.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -30,6 +30,10 @@
#include <rcssserver3d_config.h>
#endif
+#if __APPLE__
+#include <SDL.h>
+#endif
+
using namespace spark;
using namespace kerosin;
using namespace oxygen;
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -21,9 +21,21 @@
check_include_file("execinfo.h" HAVE_EXECINFO_H)
check_include_file("unistd.h" HAVE_UNISTD_H)
check_include_file("poll.h" HAVE_POLL_H)
+
check_include_file("CoreFoundation/CoreFoundation.h"
- HAVE_COREFOUNDATION_COREFOUNDATION_H)
+ HAVE_COREFOUNDATION_COREFOUNDATION_H)
+if (USE_COREFOUNDATION STREQUAL "OFF")
+else (USE_COREFOUNDATION STREQUAL "OFF")
+ if (HAVE_COREFOUNDATION_COREFOUNDATION_H)
+ set(USE_COREFOUNDATION ON)
+ message("USE_COREFOUNDATION ON")
+ else (HAVE_COREFOUNDATION_COREFOUNDATION_H)
+ set(USE_COREFOUNDATION OFF)
+ message("USE_COREFOUNDATION OFF")
+ endif (HAVE_COREFOUNDATION_COREFOUNDATION_H)
+endif (USE_COREFOUNDATION STREQUAL "OFF")
+
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
if(WIN32)
find_package(zlib REQUIRED)
@@ -185,3 +197,5 @@
#include $(top_srcdir)/config.aux/sf.am
#
#include $(top_srcdir)/config.aux/cvs.am
+
+
Modified: trunk/spark/lib/CMakeLists.txt
===================================================================
--- trunk/spark/lib/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,3 +1,18 @@
+include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+
+if (USE_COREFOUNDATION)
+ add_definitions(-DUSE_COREFOUNDATION)
+endif (USE_COREFOUNDATION)
+
+if (APPLE)
+ if (USE_COREFOUNDATION)
+ set(salt_require_libs /System/Library/Frameworks/CoreFoundation.framework)
+ endif (USE_COREFOUNDATION)
+ set(zeitgeist_require_libs salt ${salt_require_libs})
+ set(oxygen_require_libs zeitgeist ${zeitgeist_require_libs})
+ set(kerosin_require_libs oxygen ${oxygen_require_libs})
+endif (APPLE)
+
add_subdirectory(salt)
add_subdirectory(zeitgeist)
add_subdirectory(oxygen)
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -125,7 +125,7 @@
add_library(kerosin SHARED ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
target_link_libraries(kerosin ${FREETYPE_LIBRARIES} ${DevIL_LIBRARIES}
- ${SDL_LIBRARY} ${OPENGL_LIBRARIES})
+ ${SDL_LIBRARY} ${OPENGL_LIBRARIES} ${kerosin_require_libs})
set_target_properties(kerosin PROPERTIES VERSION ${KEROSIN_VERSION}
SOVERSION ${KEROSIN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -221,7 +221,7 @@
add_library(oxygen SHARED ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
-target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES} ${ODE_LIBRARY})
+target_link_libraries(oxygen rcssnet3D ${Boost_LIBRARIES} ${ODE_LIBRARY} ${oxygen_require_libs})
set_target_properties(oxygen PROPERTIES VERSION ${OXYGEN_VERSION}
SOVERSION ${OXYGEN_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/salt/CMakeLists.txt
===================================================================
--- trunk/spark/lib/salt/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/salt/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -28,7 +28,7 @@
add_library(salt SHARED ${salt_LIB_SRCS} ${salt_LIB_HDRS})
-target_link_libraries(salt libobject)
+target_link_libraries(salt libobject ${salt_require_libs})
set_target_properties(salt PROPERTIES VERSION ${SALT_VERSION}
SOVERSION ${SALT_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/salt/fileclasses.cpp
===================================================================
--- trunk/spark/lib/salt/fileclasses.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/salt/fileclasses.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -26,9 +26,11 @@
#include <sparkconfig.h>
#endif
+#if USE_COREFOUNDATION
#if HAVE_COREFOUNDATION_COREFOUNDATION_H
#include <CoreFoundation/CoreFoundation.h>
#endif
+#endif
namespace salt
{
@@ -60,6 +62,7 @@
std::string
RFile::BundlePath()
{
+#if USE_COREFOUNDATION
#if HAVE_COREFOUNDATION_COREFOUNDATION_H
char path[1024];
CFBundleRef mainBundle = CFBundleGetMainBundle();
@@ -77,6 +80,7 @@
CFRelease(cfStringRef);
return std::string(path) + Sep();
+#endif
#else
# ifdef PREFIX
return PREFIX + Sep() + "share" + Sep() + PACKAGE_NAME + Sep();
Modified: trunk/spark/lib/zeitgeist/CMakeLists.txt
===================================================================
--- trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/zeitgeist/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -58,7 +58,7 @@
add_library(zeitgeist SHARED ${zeitgeist_LIB_SRCS} ${zeitgeist_LIB_HDRS})
-target_link_libraries(zeitgeist ${RUBY_LIBRARY})
+target_link_libraries(zeitgeist ${RUBY_LIBRARY} ${zeitgeist_require_libs})
set_target_properties(zeitgeist PROPERTIES VERSION ${ZEITGEIST_VERSION}
SOVERSION ${ZEITGEIST_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -586,8 +586,10 @@
// get the (OS specific) path to the script directory
string pkgdatadir = salt::RFile::BundlePath();
#if __APPLE__
+#if USE_COREFOUNDATION
pkgdatadir += "Contents/Resources/";
#endif
+#endif
ERunScriptErrorType result = eNotFound;
Modified: trunk/spark/plugin/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,5 +1,14 @@
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
+ ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+if (APPLE)
+ if (USE_COREFOUNDATION)
+ set(spark_libs kerosin oxygen zeitgeist salt /System/Library/Frameworks/CoreFoundation.framework)
+ else (USE_COREFOUNDATION)
+ set(spark_libs kerosin oxygen zeitgeist salt)
+ endif (USE_COREFOUNDATION)
+endif (APPLE)
+
add_subdirectory(filesystemstd)
add_subdirectory(filesystemzip)
add_subdirectory(forceeffector)
@@ -18,4 +27,10 @@
add_subdirectory(soundsystemfmod)
add_subdirectory(inputwx)
add_subdirectory(openglsyswx)
-add_subdirectory(imageperceptor)
+if (APPLE)
+ if (DEVEL)
+ add_subdirectory(imageperceptor)
+ endif (DEVEL)
+else (APPLE)
+ add_subdirectory(imageperceptor)
+endif (APPLE)
Modified: trunk/spark/plugin/collisionperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/collisionperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -22,7 +22,7 @@
add_library(collisionperceptor MODULE ${collisionperceptor_LIB_SRCS})
-target_link_libraries(collisionperceptor)
+target_link_libraries(collisionperceptor ${spark_libs})
set_target_properties(collisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS collisionperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemrar/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemrar/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/filesystemrar/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(filesystemrar MODULE ${filesystemrar_LIB_SRCS})
-target_link_libraries(filesystemrar)
+target_link_libraries(filesystemrar ${spark_libs})
set_target_properties(filesystemrar PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS filesystemrar DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemstd/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemstd/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/filesystemstd/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(filesystemstd MODULE ${filesystemstd_LIB_SRCS})
-target_link_libraries(filesystemstd)
+target_link_libraries(filesystemstd ${spark_libs})
set_target_properties(filesystemstd PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS filesystemstd DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/filesystemzip/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/filesystemzip/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
include_directories(${ZLIB_INCLUDE_DIR})
endif(WIN32)
- target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY})
+ target_link_libraries(filesystemzip ${Boost_REGEX_LIBRARY} ${spark_libs} z)
set_target_properties(filesystemzip PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS filesystemzip DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/forceeffector/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/forceeffector/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/forceeffector/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -11,7 +11,7 @@
add_library(forceeffector MODULE ${forceeffector_LIB_SRCS})
-target_link_libraries(forceeffector)
+target_link_libraries(forceeffector ${spark_libs})
set_target_properties(forceeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS forceeffector DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/gyrorateperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(gyrorateperceptor MODULE ${gyrorateperceptor_LIB_SRCS})
-target_link_libraries(gyrorateperceptor)
+target_link_libraries(gyrorateperceptor ${spark_libs})
set_target_properties(gyrorateperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS gyrorateperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/imageperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/imageperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -14,7 +14,9 @@
add_library(imageperceptor MODULE ${imageperceptor_LIB_SRCS})
-target_link_libraries(imageperceptor)
+target_link_libraries(imageperceptor ${spark_libs})
set_target_properties(imageperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
-install(TARGETS imageperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
+if (NOT APPLE)
+ install(TARGETS imageperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
+endif (NOT APPLE)
Modified: trunk/spark/plugin/imageperceptor/imageperceptor.cpp
===================================================================
--- trunk/spark/plugin/imageperceptor/imageperceptor.cpp 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/imageperceptor/imageperceptor.cpp 2009-03-05 13:42:41 UTC (rev 52)
@@ -22,7 +22,11 @@
// #include <IL/ilu.h>
// #include <sstream>
#ifndef WIN32
+#if __APPLE__
+#include <OpenGL/gl.h>
+#else
#include <GL/gl.h>
+#endif
#else
#include <windows.h>
#include <GL/gl.h>
Modified: trunk/spark/plugin/inputsdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputsdl/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/inputsdl/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -23,7 +23,7 @@
add_library(inputsdl MODULE ${inputsdl_LIB_SRCS})
-target_link_libraries(inputsdl)
+target_link_libraries(inputsdl ${spark_libs})
set_target_properties(inputsdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS inputsdl DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/inputwx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/inputwx/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/inputwx/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
add_definitions(${wxWidgets_DEFINITIONS})
add_library(inputwx MODULE ${inputwx_LIB_SRCS})
- target_link_libraries(inputwx)
+ target_link_libraries(inputwx ${wxWidgets_LIBRARIES} ${spark_libs})
set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
set_target_properties(inputwx PROPERTIES VERSION 0.0.0 SOVERSION 0)
Modified: trunk/spark/plugin/objimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/objimporter/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/objimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(objimporter MODULE ${objimporter_LIB_SRCS})
-target_link_libraries(objimporter)
+target_link_libraries(objimporter ${spark_libs})
set_target_properties(objimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS objimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/openglsyssdl/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/openglsyssdl/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -14,7 +14,7 @@
add_library(openglsyssdl MODULE ${openglsyssdl_LIB_SRCS})
-target_link_libraries(openglsyssdl)
+target_link_libraries(openglsyssdl ${spark_libs})
set_target_properties(openglsyssdl PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS openglsyssdl DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/openglsyswx/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/openglsyswx/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -13,7 +13,7 @@
add_definitions(${wxWidgets_DEFINITIONS})
add_library(openglsyswx MODULE ${openglsyswx_LIB_SRCS})
- target_link_libraries(openglsyswx)
+ target_link_libraries(openglsyswx ${wxWidgets_LIBRARIES} ${spark_libs})
set_target_properties(openglsyswx PROPERTIES VERSION 0.0.0 SOVERSION 0)
set_target_properties(inputwx PROPERTIES COMPILE_FLAGS ${wxWidgets_CXX_FLAGS})
Modified: trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/perfectvisionperceptor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -10,7 +10,7 @@
add_library(perfectvisionperceptor MODULE ${perfectvisionperceptor_LIB_SRCS})
-target_link_libraries(perfectvisionperceptor)
+target_link_libraries(perfectvisionperceptor ${spark_libs})
set_target_properties(perfectvisionperceptor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS perfectvisionperceptor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/rosimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/rosimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
add_library(rosimporter MODULE ${rosimporter_LIB_SRCS})
-target_link_libraries(rosimporter tinyxml_ex)
+target_link_libraries(rosimporter tinyxml_ex ${spark_libs})
set_target_properties(rosimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS rosimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/rubysceneimporter/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/rubysceneimporter/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/rubysceneimporter/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -9,7 +9,7 @@
add_library(rubysceneimporter MODULE ${rubysceneimporter_LIB_SRCS})
-target_link_libraries(rubysceneimporter sexp)
+target_link_libraries(rubysceneimporter sexp ${spark_libs})
set_target_properties(rubysceneimporter PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS rubysceneimporter DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sceneeffector/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sceneeffector/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sceneeffector/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -11,7 +11,7 @@
add_library(sceneeffector MODULE ${sceneeffector_LIB_SRCS})
-target_link_libraries(sceneeffector)
+target_link_libraries(sceneeffector ${spark_libs})
set_target_properties(sceneeffector PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sceneeffector DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sexpparser/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sexpparser/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sexpparser/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -9,7 +9,7 @@
add_library(sexpparser MODULE ${sexpparser_LIB_SRCS})
-target_link_libraries(sexpparser sexp)
+target_link_libraries(sexpparser sexp ${spark_libs})
set_target_properties(sexpparser PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sexpparser DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/soundsystembass/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/soundsystembass/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/soundsystembass/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -16,7 +16,7 @@
add_library(soundsystembass MODULE ${soundsystembass_LIB_SRCS})
-target_link_libraries(soundsystembass)
+target_link_libraries(soundsystembass ${spark_libs})
set_target_properties(soundsystembass PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS soundsystembass DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -20,7 +20,7 @@
add_library(soundsystemfmod MODULE ${soundsystemfmod_LIB_SRCS})
- target_link_libraries(soundsystemfmod ${FMOD_LIBRARIES})
+ target_link_libraries(soundsystemfmod ${FMOD_LIBRARIES} ${spark_libs})
set_target_properties(soundsystemfmod PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS soundsystemfmod DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sparkagent/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sparkagent/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sparkagent/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -31,7 +31,7 @@
add_library(sparkagent MODULE ${sparkagent_LIB_SRCS})
-target_link_libraries(sparkagent)
+target_link_libraries(sparkagent ${spark_libs})
set_target_properties(sparkagent PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sparkagent DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/plugin/sparkmonitor/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/sparkmonitor/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/plugin/sparkmonitor/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -15,7 +15,7 @@
add_library(sparkmonitor MODULE ${sparkmonitor_LIB_SRCS})
-target_link_libraries(sparkmonitor sexp)
+target_link_libraries(sparkmonitor sexp ${spark_libs})
set_target_properties(sparkmonitor PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS sparkmonitor DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/spark/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -8,12 +8,16 @@
if(WIN32)
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/windows/include)
else(WIN32)
- include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS})
+ include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
endif(WIN32)
add_library(spark SHARED ${spark_LIB_SRCS})
-target_link_libraries(spark)
+if (APPLE)
+ target_link_libraries(spark salt zeitgeist oxygen kerosin)
+else (APPLE)
+ target_link_libraries(spark)
+endif (APPLE)
set_target_properties(spark PROPERTIES VERSION ${SPARK_VERSION}
SOVERSION ${SPARK_SO_VERSION} DEBUG_POSTFIX _debug)
Modified: trunk/spark/test/CMakeLists.txt
===================================================================
--- trunk/spark/test/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/test/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,4 +1,5 @@
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility)
+include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
+ ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
add_subdirectory(coretest)
add_subdirectory(fonttest)
Modified: trunk/spark/utility/CMakeLists.txt
===================================================================
--- trunk/spark/utility/CMakeLists.txt 2009-02-17 11:53:43 UTC (rev 51)
+++ trunk/spark/utility/CMakeLists.txt 2009-03-05 13:42:41 UTC (rev 52)
@@ -1,3 +1,5 @@
+include_directories(${CMAKE_SOURCE_DIR}/lib ${Boost_INCLUDE_DIRS})
+
add_subdirectory(libobj)
add_subdirectory(rcssnet)
add_subdirectory(sfsexp)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
