Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[89] trunk
|
From: <he...@us...> - 2009-08-13 14:55:00
|
Revision: 89
http://simspark.svn.sourceforge.net/simspark/?rev=89&view=rev
Author: hedayat
Date: 2009-08-13 14:54:41 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
Many CMake cleanups
Add ODE flags globally
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/cmake/FindODE.cmake
trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt
trunk/rcssserver3d/simspark/CMakeLists.txt
trunk/rsgedit/CMakeLists.txt
trunk/rsgedit/ChangeLog
trunk/rsgedit/src/CMakeLists.txt
trunk/rsgedit/wxutil/CMakeLists.txt
trunk/simspark-utilities/CMakeLists.txt
trunk/simspark-utilities/ChangeLog
trunk/simspark-utilities/gendot/CMakeLists.txt
trunk/simspark-utilities/monitorspark/CMakeLists.txt
trunk/simspark-utilities/sampleagent/CMakeLists.txt
trunk/simspark-utilities/samplesim/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/cmake/FindFMOD.cmake
trunk/spark/lib/CMakeLists.txt
trunk/spark/lib/oxygen/CMakeLists.txt
trunk/spark/plugin/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-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -26,9 +26,12 @@
set (CMAKE_BUILD_TYPE Release)
endif(NOT CMAKE_BUILD_TYPE)
-add_definitions(-DHAVE_CONFIG_H)
-include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS})
+add_definitions(-DHAVE_CONFIG_H ${ODE_CFLAGS})
+include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
+ ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR}
+ ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
link_directories(${Boost_LIBRARY_DIRS})
+
if (UNIX)
set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE
STRING "Common C++ compiler flags" FORCE)
@@ -37,10 +40,10 @@
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE
STRING "C++ compiler flags for Release builds" FORCE)
endif (UNIX)
+
if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
- include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/windows/include)
+ include_directories(${CMAKE_SOURCE_DIR}/windows/include)
if(MSVC)
add_definitions(/Gm /Zi /GL)
endif(MSVC)
@@ -58,7 +61,6 @@
########## generate configuration file ##########
if (APPLE)
- # TODO: it probably doesn't work on Mac OSX. Please fix it!
set(BUNDLE_PATH ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME})
elseif (UNIX)
set(BUNDLE_PATH ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME})
@@ -85,7 +87,7 @@
install(FILES ${CMAKE_BINARY_DIR}/rcssserver3d_config.h
DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
-if (WIN32)
+if (WIN32) # try to find and install third-party .dlls to bin/ directory
string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" ODEDLL "${ODE_LIBRARY}")
if (EXISTS ${ODEDLL})
install(PROGRAMS ${ODEDLL} DESTINATION ${BINDIR})
@@ -107,6 +109,7 @@
install(PROGRAMS ${SDL_DLL} DESTINATION ${BINDIR})
endif (EXISTS ${SDL_DLL})
endif (WIN32)
+
########### uninstall support ############
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,3 +1,20 @@
+2009-08-13 Hedayat Vatankhah <he...@gr...>
+
+ * simspark/CMakeLists.txt:
+ * rcssmonitor3d/CMakeLists.txt:
+ * rcssagent3d/CMakeLists.txt:
+ * plugin/soccermonitor/CMakeLists.txt:
+ * plugin/soccer/CMakeLists.txt:
+ - removing duplicate include dirs
+
+ * cmake/FindODE.cmake:
+ - updated with spark FindODE.cmake module which adds proper compiler flags
+ for possible ode usage
+
+ * CMakeLists.txt:
+ - add ode flags and include dir to compiler flags
+ - add common include directories to compiler flags
+
2009-08-09 Hedayat Vatankhah <he...@gr...>
* plugin/soccer/CMakeLists.txt:
Modified: trunk/rcssserver3d/cmake/FindODE.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindODE.cmake 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/cmake/FindODE.cmake 2009-08-13 14:54:41 UTC (rev 89)
@@ -3,10 +3,46 @@
# ODE_INCLUDE_DIR - where the directory containing the ODE headers can be
# found
# ODE_LIBRARY - full path to the ODE library
+# ODE_CFLAGS - additional compiler flags for ODE
# ODE_FOUND - TRUE if ODE was found
IF (NOT ODE_FOUND)
+ FIND_PROGRAM(ODE_CONFIG ode-config)
+ IF(ODE_CONFIG)
+ # Use the newer EXECUTE_PROCESS command if it is available.
+ IF(COMMAND EXECUTE_PROCESS)
+ EXECUTE_PROCESS(
+ COMMAND ${ODE_CONFIG} --cflags
+ OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ RESULT_VARIABLE ODE_CONFIG_RESULT
+ )
+ ELSE(COMMAND EXECUTE_PROCESS)
+ EXEC_PROGRAM(${ODE_CONFIG} ARGS "--cflags"
+ OUTPUT_VARIABLE ODE_CONFIG_CFLAGS
+ RETURN_VALUE ODE_CONFIG_RESULT
+ )
+ ENDIF(COMMAND EXECUTE_PROCESS)
+
+ # Parse the include flags.
+ IF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ # Convert the compile flags to a CMake list.
+ STRING(REGEX REPLACE " +" ";"
+ ODE_CONFIG_CFLAGS "${ODE_CONFIG_CFLAGS}")
+
+ # Look for -D options.
+ SET(ODE_EXTRA_CFLAGS)
+ FOREACH(flag ${ODE_CONFIG_CFLAGS})
+ IF("${flag}" MATCHES "^-D")
+ SET(ODE_EXTRA_CFLAGS ${ODE_EXTRA_CFLAGS} "${flag}")
+ ENDIF("${flag}" MATCHES "^-D")
+ ENDFOREACH(flag)
+ ELSE("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ MESSAGE("Error running ${ODE_CONFIG}: [${ODE_CONFIG_RESULT}]")
+ ENDIF("${ODE_CONFIG_RESULT}" MATCHES "^0$")
+ ENDIF(ODE_CONFIG)
+
FIND_PATH(ODE_INCLUDE_DIR ode/ode.h
/usr/include
/usr/local/include
@@ -26,12 +62,27 @@
C:/library/ode/lib/
"C:/Program Files/ode/lib/"
C:/ode/lib/
- PATH_SUFFIXES
- releaselib
- ReleaseDoubleDLL ReleaseDoubleLib
- ReleaseSingleDLL ReleaseSingleLib
+ PATH_SUFFIXES
+ releaselib
+ ReleaseDoubleDLL ReleaseDoubleLib
+ ReleaseSingleDLL ReleaseSingleLib
)
+ IF (WIN32)
+ IF("${ODE_LIBRARY}" MATCHES ".*double.*")
+ SET(ODE_EXTRA_CFLAGS "-DdDOUBLE")
+ ELSE("${ODE_LIBRARY}" MATCHES ".*double.*")
+ SET(ODE_EXTRA_CFLAGS "-DdSINGLE")
+ ENDIF("${ODE_LIBRARY}" MATCHES ".*double.*")
+ ENDIF (WIN32)
+
+ IF (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS ${ODE_EXTRA_CFLAGS} CACHE STRING "Additional ODE flags")
+ MESSAGE(STATUS "Found additional flags for ODE: ${ODE_CFLAGS}")
+ ELSE (ODE_EXTRA_CFLAGS)
+ SET(ODE_CFLAGS CACHE STRING "Additional ODE flags")
+ ENDIF (ODE_EXTRA_CFLAGS)
+
IF(ODE_INCLUDE_DIR)
MESSAGE(STATUS "Found ODE include dir: ${ODE_INCLUDE_DIR}")
ELSE(ODE_INCLUDE_DIR)
Modified: trunk/rcssserver3d/plugin/soccer/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/plugin/soccer/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -119,9 +119,8 @@
hmdp_effector/naospecific.cpp
)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SPARK_INCLUDE_DIR}
- ${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR}
- ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_library(soccer MODULE ${soccer_LIB_SRCS} ${soccer_LIB_HDRS})
Modified: trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/plugin/soccermonitor/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -18,9 +18,8 @@
soccerinputlogplayer_c.cpp
)
-include_directories(${CMAKE_SOURCE_DIR}/plugin ${SPARK_INCLUDE_DIR}
- ${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR}
- ${KEROSIN_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS} ${DevIL_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/plugin ${FREETYPE_INCLUDE_DIRS}
+ ${DevIL_INCLUDE_DIR})
add_library(soccermonitor MODULE ${soccermonitor_LIB_SRCS}
${soccermonitor_LIB_HDRS})
Modified: trunk/rcssserver3d/rcssagent3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/rcssagent3d/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -13,9 +13,6 @@
naobehavior.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
add_executable(rcssagent3d ${rcssagent3d_SRCS})
if (WIN32)
Modified: trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/rcssmonitor3d/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -8,9 +8,7 @@
set(SDL_LINK_LIBS ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
endif (APPLE)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
- ${SDL_INCLUDE_DIR})
+include_directories(${SDL_INCLUDE_DIR})
add_executable(rcssmonitor3d ${rcssmonitor3d_SRCS})
Modified: trunk/rcssserver3d/simspark/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/simspark/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rcssserver3d/simspark/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -10,9 +10,7 @@
set(SDL_LINK_LIBS ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
endif (APPLE)
-include_directories( ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR}
- ${SDL_INCLUDE_DIR})
+include_directories(${SDL_INCLUDE_DIR})
target_link_libraries(simspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
${ZEITGEIST_LIBRARIES} ${OXYGEN_LIBRARIES} ${KEROSIN_LIBRARIES}
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rsgedit/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -16,7 +16,7 @@
set (CMAKE_BUILD_TYPE Release)
endif(NOT CMAKE_BUILD_TYPE)
-add_definitions(-DHAVE_CONFIG_H)
+add_definitions(-DHAVE_CONFIG_H ${wxWidgets_DEFINITIONS})
include_directories(${CMAKE_BINARY_DIR})
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
Modified: trunk/rsgedit/ChangeLog
===================================================================
--- trunk/rsgedit/ChangeLog 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rsgedit/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
@@ -0,0 +1,7 @@
+2009-08-13 Hedayat Vatankhah <he...@gr...>
+
+ * src/CMakeLists.txt:
+ * wxutil/CMakeLists.txt:
+ * CMakeLists.txt:
+ - add wxWidgets definitions to toplevel compiler flags and remove from
+ other files
\ No newline at end of file
Modified: trunk/rsgedit/src/CMakeLists.txt
===================================================================
--- trunk/rsgedit/src/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rsgedit/src/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -38,7 +38,6 @@
sparkglcanvas.cpp
)
-add_definitions(${wxWidgets_DEFINITIONS})
include_directories(${CMAKE_SOURCE_DIR}/wxutil/include
${CMAKE_SOURCE_DIR}
${wxWidgets_INCLUDE_DIRS} ${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
Modified: trunk/rsgedit/wxutil/CMakeLists.txt
===================================================================
--- trunk/rsgedit/wxutil/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/rsgedit/wxutil/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -132,7 +132,7 @@
src/wxscintilla/src/XPM.cxx
)
-add_definitions(${wxWidgets_DEFINITIONS} -D __WX__ -D LINK_LEXERS -D SCI_LEXER)
+add_definitions(-D __WX__ -D LINK_LEXERS -D SCI_LEXER)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include
${wxWidgets_INCLUDE_DIRS})
add_library(wxutil SHARED ${wxutil_LIB_SRCS} ${wxutil_LIB_HDRS})
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -22,6 +22,11 @@
endif(NOT CMAKE_BUILD_TYPE)
add_definitions(-DHAVE_CONFIG_H)
+include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${SPARK_INCLUDE_DIR}
+ ${SALT_INCLUDE_DIR} ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR}
+ ${KEROSIN_INCLUDE_DIR})
+link_directories(${Boost_LIBRARY_DIRS})
+
if (UNIX)
set(CMAKE_CXX_FLAGS "-Wno-deprecated" CACHE
STRING "Common C++ compiler flags" FORCE)
@@ -42,8 +47,6 @@
if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
- include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
- link_directories(${Boost_LIBRARY_DIRS})
if(MSVC)
add_definitions(/Gm /Zi /GL)
endif(MSVC)
Modified: trunk/simspark-utilities/ChangeLog
===================================================================
--- trunk/simspark-utilities/ChangeLog 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,3 +1,14 @@
+2009-08-13 Hedayat Vatankhah <he...@gr...>
+
+ * CMakeLists.txt:
+ - add common include directories
+
+ * gendot/CMakeLists.txt:
+ * monitorspark/CMakeLists.txt:
+ * sampleagent/CMakeLists.txt:
+ * samplesim/CMakeLists.txt:
+ - remove duplicate include directories
+
2009-08-07 Marian Buchta <mar...@gm...>
* CMakeLists.txt
Modified: trunk/simspark-utilities/gendot/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/gendot/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/gendot/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -4,9 +4,6 @@
main.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
add_executable(gendot ${gendot_SRCS})
target_link_libraries(gendot ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
Modified: trunk/simspark-utilities/monitorspark/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/monitorspark/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/monitorspark/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -3,9 +3,6 @@
main.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
add_executable(monitorspark ${monitorspark_SRCS})
target_link_libraries(monitorspark ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
Modified: trunk/simspark-utilities/sampleagent/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/sampleagent/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/sampleagent/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -9,7 +9,6 @@
leggedspherebehavior.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
add_executable(sampleagent ${sampleagent_SRCS})
target_link_libraries(sampleagent ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
Modified: trunk/simspark-utilities/samplesim/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/samplesim/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/simspark-utilities/samplesim/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -4,9 +4,6 @@
main.cpp
)
-include_directories(${SPARK_INCLUDE_DIR} ${SALT_INCLUDE_DIR}
- ${ZEITGEIST_INCLUDE_DIR} ${OXYGEN_INCLUDE_DIR} ${KEROSIN_INCLUDE_DIR})
-
add_executable(samplesim ${samplesim_SRCS})
target_link_libraries(samplesim ${SPARK_LIBRARIES} ${SALT_LIBRARIES}
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -28,10 +28,10 @@
if (NOT USE_COREFOUNDATION STREQUAL "OFF")
if (HAVE_COREFOUNDATION_COREFOUNDATION_H)
set(USE_COREFOUNDATION ON)
- message("USE_COREFOUNDATION ON")
+ message(STATUS " USE_COREFOUNDATION ON")
else (HAVE_COREFOUNDATION_COREFOUNDATION_H)
set(USE_COREFOUNDATION OFF)
- message("USE_COREFOUNDATION OFF")
+ message(STATUS " USE_COREFOUNDATION OFF")
endif (HAVE_COREFOUNDATION_COREFOUNDATION_H)
endif (NOT USE_COREFOUNDATION STREQUAL "OFF")
@@ -94,8 +94,8 @@
set (CMAKE_BUILD_TYPE Release)
endif(NOT CMAKE_BUILD_TYPE)
-add_definitions(-DHAVE_CONFIG_H)
-include_directories(${CMAKE_BINARY_DIR})
+add_definitions(-DHAVE_CONFIG_H ${ODE_CFLAGS})
+include_directories(${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
link_directories(${Boost_LIBRARY_DIRS})
if (UNIX)
@@ -123,14 +123,23 @@
if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -DBOOST_ALL_DYN_LINK)
- include_directories(${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR}
- ${CMAKE_SOURCE_DIR}/windows/include)
+ include_directories(${CMAKE_SOURCE_DIR}/windows/include)
if(MSVC)
add_definitions(/Gm /Zi /GL)
endif(MSVC)
endif(WIN32)
########## library version numbers ##########
+# Version numbers: .so version, major version, and minor version
+# example: libspark.so.SO_VERSION.MAJOR_VERSION.MINOR_VERSION
+# Each of these version numbers should be increased on different situations:
+# 1. So version: when the library breaks compatibility like removing an interface
+# or changing data types. Reste major & minor versions to 0.
+# 2. Major version: when library provides new features (e.g. new interface) but
+# doesn't break compatibility. Reset minor version to 0 when incremented.
+# 3. Minor version: library changed but without any new interfaces or breaking
+# compatibility
+
set(SALT_SO_VERSION 0)
set(SALT_VERSION ${SALT_SO_VERSION}.3.2)
set(ZEITGEIST_SO_VERSION 3)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/ChangeLog 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,7 +1,23 @@
+2009-08-13 Hedayat Vatankhah <he...@gr...>
+
+ * spark/CMakeLists.txt:
+ * test/CMakeLists.txt:
+ * utility/CMakeLists.txt:
+ * lib/oxygen/CMakeLists.txt:
+ - remove duplicate compiler flags
+
+ * CMakeLists.txt:
+ - always add boost and ode include directories, not just in windows
+ - added a small guideline about changing library version numbers
+ - add ode compiler flags instead of providing it only for oxygen
+
+ * cmake/FindFMOD.cmake:
+ - do not check for 2.6 version here, it's done before
+
2009-08-11 Hedayat Vatankhah <he...@gr...>
* cmake/FindODE.cmake:
- - do not check for ODe library name under Linux
+ - do not check for ODE library name under Linux
2009-08-09 Hedayat Vatankhah <he...@gr...>
Modified: trunk/spark/cmake/FindFMOD.cmake
===================================================================
--- trunk/spark/cmake/FindFMOD.cmake 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/cmake/FindFMOD.cmake 2009-08-13 14:54:41 UTC (rev 89)
@@ -47,7 +47,6 @@
FIND_LIBRARY(FMOD_LIBRARIES debug fmodexp optimized fmodex PATHS ${FMOD_LIBRARY_SEARCH_DIRS})
ELSE (WIN32) #Unix
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
FIND_PACKAGE(PkgConfig)
IF(PKG_CONFIG_FOUND)
# TODO i don't know how this would be registered in pkg-config
Modified: trunk/spark/lib/CMakeLists.txt
===================================================================
--- trunk/spark/lib/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/lib/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,5 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/utility ${Boost_INCLUDE_DIRS}
- ${ODE_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/utility)
if (USE_COREFOUNDATION)
add_definitions(-DUSE_COREFOUNDATION)
Modified: trunk/spark/lib/oxygen/CMakeLists.txt
===================================================================
--- trunk/spark/lib/oxygen/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/lib/oxygen/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -218,8 +218,7 @@
)
endif(SPADES_FOUND)
-add_definitions(${ODE_CFLAGS})
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility/)
+include_directories(${CMAKE_SOURCE_DIR}/lib)
add_library(oxygen ${oxygen_LIB_SRCS} ${oxygen_LIB_HDRS})
Modified: trunk/spark/plugin/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/plugin/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,5 +1,5 @@
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
- ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ ${OPENGL_INCLUDE_DIR})
# It is problematic under Linux! Will cause segfaults on simspark exit.
if (WIN32 OR APPLE)
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/spark/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -6,7 +6,7 @@
)
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS}
- ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR} ${DevIL_INCLUDE_DIR})
+ ${DevIL_INCLUDE_DIR})
add_library(spark ${spark_LIB_SRCS})
Modified: trunk/spark/test/CMakeLists.txt
===================================================================
--- trunk/spark/test/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/test/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,8 +1,5 @@
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility
- ${Boost_INCLUDE_DIRS} ${ODE_INCLUDE_DIR})
+include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility)
-link_directories(${Boost_LIBRARY_DIRS})
-
add_subdirectory(coretest)
add_subdirectory(fonttest)
add_subdirectory(inputtest)
Modified: trunk/spark/utility/CMakeLists.txt
===================================================================
--- trunk/spark/utility/CMakeLists.txt 2009-08-11 16:17:37 UTC (rev 88)
+++ trunk/spark/utility/CMakeLists.txt 2009-08-13 14:54:41 UTC (rev 89)
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_SOURCE_DIR}/lib ${Boost_INCLUDE_DIRS})
+include_directories(${CMAKE_SOURCE_DIR}/lib)
add_subdirectory(libobj)
add_subdirectory(rcssnet)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
