Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[17] trunk/spark
|
From: <he...@us...> - 2008-12-01 15:04:12
|
Revision: 17
http://simspark.svn.sourceforge.net/simspark/?rev=17&view=rev
Author: hedayat
Date: 2008-12-01 15:04:08 +0000 (Mon, 01 Dec 2008)
Log Message:
-----------
Added CPACK support
Added FMOD checking support
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
Added Paths:
-----------
trunk/spark/cmake/FindFMOD.cmake
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2008-11-30 21:56:52 UTC (rev 16)
+++ trunk/spark/CMakeLists.txt 2008-12-01 15:04:08 UTC (rev 17)
@@ -32,6 +32,7 @@
find_package(ODE REQUIRED)
find_package(OpenGL REQUIRED)
find_package(SDL REQUIRED)
+find_package(FMOD)
set(HAVE_IL_IL_H 1)
set(HAVE_KEROSIN_KEROSIN_H 1)
@@ -55,6 +56,8 @@
"The directory to install includes into.")
set(CMAKE_SHARED_MODULE_PREFIX "")
+mark_as_advanced(BINDIR LIBDIR DATADIR INCLUDEDIR)
+
########## library version numbers ##########
set(SALT_SO_VERSION 3)
set(SALT_VERSION ${SALT_SO_VERSION}.1.3)
@@ -106,7 +109,15 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sparkconfig.h DESTINATION
${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
+########### CPack section #############
+set(CPACK_SOURCE_GENERATOR TGZ)
+set(CPACK_SOURCE_IGNORE_FILES
+ /CVS/ /[.]svn/ /.*[.]o /autom4te[.]cache/ /[.].*)
+set(CPACK_PACKAGE_VERSION "0.1")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME
+ ${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION})
+include(CPack)
#original Makefile.am contents follow:
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2008-11-30 21:56:52 UTC (rev 16)
+++ trunk/spark/ChangeLog 2008-12-01 15:04:08 UTC (rev 17)
@@ -1,3 +1,15 @@
+2008-12-01 Hedayat Vatankhah <he...@gr...>
+
+ * plugin/soundsystemfmod/CMakeLists.txt:
+ - fixed FMOD support
+
+ * cmake/FindFMOD.cmake:
+ - added to the project
+
+ * CMakeLists.txt:
+ - added initial cpack support
+ - added check for FMOD
+
2008-11-25 Hedayat Vatankhah <he...@gr...>
* lib/oxygen/Makefile.am:
Added: trunk/spark/cmake/FindFMOD.cmake
===================================================================
--- trunk/spark/cmake/FindFMOD.cmake (rev 0)
+++ trunk/spark/cmake/FindFMOD.cmake 2008-12-01 15:04:08 UTC (rev 17)
@@ -0,0 +1,94 @@
+# - Find FMOD includes and library
+#
+# This module defines
+# FMOD_INCLUDE_DIRS
+# FMOD_LIBRARIES, the libraries to link against to use FMOD.
+# FMOD_LIBRARY_DIRS, the location of the libraries
+# FMOD_FOUND, If false, do not try to use FMOD
+#
+# Copyright © 2007-2008, Matt Williams
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+IF (FMOD_LIBRARIES AND FMOD_INCLUDE_DIRS)
+ SET(FMOD_FIND_QUIETLY TRUE)
+ENDIF (FMOD_LIBRARIES AND FMOD_INCLUDE_DIRS)
+
+SET(FMOD_INCLUDE_SEARCH_DIRS
+ ${INCLUDE_SEARCH_DIRS}
+ ${CMAKE_INCLUDE_PATH}
+ /usr/include
+ /usr/local/include
+ /usr/include/fmodex
+ /usr/local/include/fmodex
+ /opt/include/fmodex
+ /opt/fmodex/include
+ CACHE STRING ""
+)
+
+SET(FMOD_LIBRARY_SEARCH_DIRS
+ ${LIBRARY_SEARCH_DIRS}
+ ${CMAKE_LIBRARY_PATH}
+ /usr/lib
+ /usr/lib64
+ /usr/local/lib
+ /usr/local/lib64
+ /opt/lib
+ /opt/lib64
+ /opt/fmodex/lib
+ /opt/fmodex/lib64
+ CACHE STRING ""
+)
+
+IF (WIN32) #Windows
+ MESSAGE(STATUS "Looking for FMOD")
+ FIND_PATH(FMOD_INCLUDE_DIRS fmod.h ${FMOD_INCLUDE_SEARCH_DIRS})
+ 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
+ PKG_SEARCH_MODULE(FMOD FMOD)
+ SET(FMOD_INCLUDE_DIRS ${FMOD_INCLUDE_DIRS})
+ SET(FMOD_LIBRARY_DIRS ${FMOD_LIBDIR})
+ SET(FMOD_LIBRARIES ${FMOD_LIBRARIES} CACHE STRING "")
+ ENDIF(PKG_CONFIG_FOUND)
+ IF(NOT FMOD_FOUND) #If PkgConfig couldn't find OGRE...
+ IF (NOT FMOD_FIND_QUIETLY)
+ MESSAGE(STATUS " Manually searching for FMOD")
+ ENDIF (NOT FMOD_FIND_QUIETLY)
+ FIND_PATH(FMOD_INCLUDE_DIRS fmod.h ${FMOD_INCLUDE_SEARCH_DIRS})
+ MESSAGE(STATUS "FMOD_INCLUDE_DIRS: " ${FMOD_INCLUDE_DIRS})
+ FIND_LIBRARY(FMOD_LIBRARY fmodex ${FMOD_LIBRARY_SEARCH_DIRS})
+ SET(FMOD_LIBRARIES ${FMOD_LIBRARY})
+ ENDIF(NOT FMOD_FOUND)
+ENDIF (WIN32)
+
+#Do some preparation
+SEPARATE_ARGUMENTS(FMOD_INCLUDE_DIRS)
+SEPARATE_ARGUMENTS(FMOD_LIBRARIES)
+
+SET(FMOD_INCLUDE_DIRS ${FMOD_INCLUDE_DIRS})
+SET(FMOD_LIBRARIES ${FMOD_LIBRARIES})
+SET(FMOD_LIBRARY_DIRS ${FMOD_LIBRARY_DIRS})
+
+MARK_AS_ADVANCED(FMOD_INCLUDE_DIRS FMOD_LIBRARIES FMOD_LIBRARY_DIRS)
+
+IF (FMOD_INCLUDE_DIRS AND FMOD_LIBRARIES)
+ SET(FMOD_FOUND TRUE)
+ENDIF (FMOD_INCLUDE_DIRS AND FMOD_LIBRARIES)
+
+IF (FMOD_FOUND)
+ IF (NOT FMOD_FIND_QUIETLY)
+ MESSAGE(STATUS " libraries : ${FMOD_LIBRARIES} from ${FMOD_LIBRARY_DIRS}")
+ MESSAGE(STATUS " includes : ${FMOD_INCLUDE_DIRS}")
+ ENDIF (NOT FMOD_FIND_QUIETLY)
+ELSE (FMOD_FOUND)
+ MESSAGE(STATUS "fmod not found!")
+ IF (FMOD_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find FMOD. Make sure you have the FMOD development headers are installed. Otherwise, try setting LIBRARY_SEARCH_DIRS and INCLUDE_SEARCH_DIRS to the place FMOD was installed with -DLIBRARY_SEARCH_DIRS=<path/to/lib> -DINCLUDE_SEARCH_DIRS=<path/to/include>")
+ ENDIF (FMOD_FIND_REQUIRED)
+ENDIF (FMOD_FOUND)
Modified: trunk/spark/plugin/soundsystemfmod/CMakeLists.txt
===================================================================
--- trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2008-11-30 21:56:52 UTC (rev 16)
+++ trunk/spark/plugin/soundsystemfmod/CMakeLists.txt 2008-12-01 15:04:08 UTC (rev 17)
@@ -15,9 +15,12 @@
)
if (FMOD_FOUND)
+ include_directories(${FMOD_INCLUDE_DIRS})
+ link_directories(${FMOD_LIBRARY_DIRS})
+
add_library(soundsystemfmod MODULE ${soundsystemfmod_LIB_SRCS})
- target_link_libraries(soundsystemfmod fmod)
+ target_link_libraries(soundsystemfmod ${FMOD_LIBRARIES})
set_target_properties(soundsystemfmod PROPERTIES VERSION 0.0.0 SOVERSION 0)
install(TARGETS soundsystemfmod DESTINATION ${LIBDIR}/${CMAKE_PROJECT_NAME})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
