Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[258] trunk/spark
|
From: <he...@us...> - 2011-03-24 18:08:56
|
Revision: 258
http://simspark.svn.sourceforge.net/simspark/?rev=258&view=rev
Author: hedayat
Date: 2011-03-24 18:08:49 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
Removing our own FindDevIL and relying on CMake's own module
Modified Paths:
--------------
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/lib/kerosin/CMakeLists.txt
trunk/spark/spark/CMakeLists.txt
trunk/spark/test/fonttest/CMakeLists.txt
trunk/spark/test/inputtest/CMakeLists.txt
trunk/spark/test/scenetest/CMakeLists.txt
Removed Paths:
-------------
trunk/spark/cmake/FindDevIL.cmake
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2011-03-24 16:29:33 UTC (rev 257)
+++ trunk/spark/CMakeLists.txt 2011-03-24 18:08:49 UTC (rev 258)
@@ -201,7 +201,7 @@
install(DIRECTORY "${Boost_LIBRARY_DIRS}/" DESTINATION ${THLIBDIR}
FILES_MATCHING PATTERN "*.dll")
- string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${DevIL_LIBRARY_IL}")
+ string(REGEX REPLACE "(.*)\\.lib" "\\1.dll" DevIL_DLL "${IL_LIBRARIES}")
if (EXISTS ${DevIL_DLL})
install(PROGRAMS ${DevIL_DLL} DESTINATION ${THLIBDIR})
endif (EXISTS ${DevIL_DLL})
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2011-03-24 16:29:33 UTC (rev 257)
+++ trunk/spark/ChangeLog 2011-03-24 18:08:49 UTC (rev 258)
@@ -1,5 +1,12 @@
2011-03-24 Hedayat Vatankhah <hed...@gm...>
+ * spark/CMakeLists.txt:
+ * lib/kerosin/CMakeLists.txt:
+ * test/fonttest/CMakeLists.txt:
+ * test/inputtest/CMakeLists.txt:
+ * test/scenetest/CMakeLists.txt:
+ - fixed to use CMake's own FindDevIL module
+
* plugin/timersystemboost/timersystemboost.h:
* plugin/timersystemboost/timersystemboost.cpp:
* plugin/timersystemboost/timersystemboost_c.cpp:
Deleted: trunk/spark/cmake/FindDevIL.cmake
===================================================================
--- trunk/spark/cmake/FindDevIL.cmake 2011-03-24 16:29:33 UTC (rev 257)
+++ trunk/spark/cmake/FindDevIL.cmake 2011-03-24 18:08:49 UTC (rev 258)
@@ -1,124 +0,0 @@
-# -Try to find DevIL (developer image) library
-# formerly known as OpenIL, see
-# http://openil.sourceforge.net
-#
-# Once run this will define:
-#
-# DevIL_FOUND
-# DevIL_INCLUDE_DIR
-# DevIL_LIBRARIES
-#
-# Jan Woetzel 12/2005.
-#
-# www.mip.informatik.uni-kiel.de/~jw
-# --------------------------------
-
-# base dirs:
-SET(DevIL_POSSIBLE_ROOT_PATHS
- ${DevIL_ROOT_DIR}
- $ENV{DevIL_ROOT_DIR}
- ${DevIL_DIR}
- $ENV{DevIL_DIR}
- ${DEVIL_DIR}
- $ENV{DEVIL_DIR}
- ${DEVIL_HOME}
- $ENV{DEVIL_HOME}
- "$ENV{EXTERN_LIBS_DIR}/DevIL"
- $ENV{EXTRA_DIR}
- $ENV{EXTRA}
- $ENV{ProgramFiles}/DevIL
- /usr/local/
- /usr/
- /opt/net/gcc41/DevIL
- /opt/net/gcc33/DevIL
- C:/library/DevIL
- "C:/Program Files/DevIL"
- "C:/Program Files (x86)/DevIL"
- C:/DevIL
- )
-
-# appended
-SET(DevIL_POSSIBLE_INCDIR_SUFFIXES
- include
- DevIL/include )
-SET(DevIL_POSSIBLE_LIBDIR_SUFFIXES
- lib
- lib64
- )
-
-
-
-FIND_PATH(DevIL_INCLUDE_DIR
- NAMES IL/il.h
- PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
- PATH_SUFFIXES ${DevIL_POSSIBLE_INCDIR_SUFFIXES} )
-#MESSAGE("DBG DevIL_INCLUDE_DIR=${DevIL_INCLUDE_DIR}")
-
-
-FIND_LIBRARY(DevIL_LIBRARY_IL
- NAMES DevIL devil DevIL IL
- PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
- PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
-#MESSAGE("DBG DevIL_LIBRARY_IL=${DevIL_LIBRARY_IL}")
-
-FIND_LIBRARY(DevIL_LIBRARY_ILU
- NAMES ILU ilu Ilu
- PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
- PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
-#MESSAGE("DBG DevIL_LIBRARY_ILU=${DevIL_LIBRARY_ILU}")
-
-FIND_LIBRARY(DevIL_LIBRARY_ILUT
- NAMES ILUT ilu Ilut
- PATHS ${DevIL_POSSIBLE_ROOT_PATHS}
- PATH_SUFFIXES ${DevIL_POSSIBLE_LIBDIR_SUFFIXES} )
-#MESSAGE("DBG DevIL_LIBRARY_ILUT=${DevIL_LIBRARY_ILUT}")
-
-
-
-# --------------------------------
-
-IF (DevIL_INCLUDE_DIR)
- IF (DevIL_LIBRARY_IL)
- IF (DevIL_LIBRARY_ILU)# AND DevIL_LIBRARY_ILUT)
-
- SET(DevIL_FOUND TRUE)
- SET(DevIL_LIBRARIES
- ${DevIL_LIBRARY_IL}
- ${DevIL_LIBRARY_ILU})
- IF (DevIL_LIBRARY_ILUT)
- SET(DevIL_LIBRARIES ${DevIL_LIBRARIES} ${DevIL_LIBRARY_ILUT})
- ENDIF (DevIL_LIBRARY_ILUT)
-
- # get the link directory for rpath to be used with LINK_DIRECTORIES:
- GET_FILENAME_COMPONENT(DevIL_LINK_DIRECTORIES ${DevIL_LIBRARY_IL} PATH)
-
- ENDIF(DevIL_LIBRARY_ILU)# AND DevIL_LIBRARY_ILUT)
- ENDIF(DevIL_LIBRARY_IL)
-ENDIF (DevIL_INCLUDE_DIR)
-
-
-MARK_AS_ADVANCED(
- DevIL_INCLUDE_DIR
- DevIL_LIBRARY_IL
- DevIL_LIBRARY_ILU
- DevIL_LIBRARY_ILUT
- DevIL_LIBRARIES
- )
-
-
-# ==========================================
-IF(NOT DevIL_FOUND)
- # make FIND_PACKAGE friendly
- IF(NOT DevIL_FIND_QUIETLY)
- IF(DevIL_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "DevIL required, please specify it's location.")
- ELSE(DevIL_FIND_REQUIRED)
- MESSAGE(STATUS "ERROR: DevIL was not found.")
- ENDIF(DevIL_FIND_REQUIRED)
- ENDIF(NOT DevIL_FIND_QUIETLY)
-ENDIF(NOT DevIL_FOUND)
-
-# backward compatibility
-SET(DEVIL_FOUND ${DevIL_FOUND})
-SET(DEVIL_LIBRARIES ${DevIL_LIBRARIES})
-SET(DEVIL_INCLUDE_DIR ${DevIL_INCLUDE_DIR})
Modified: trunk/spark/lib/kerosin/CMakeLists.txt
===================================================================
--- trunk/spark/lib/kerosin/CMakeLists.txt 2011-03-24 16:29:33 UTC (rev 257)
+++ trunk/spark/lib/kerosin/CMakeLists.txt 2011-03-24 18:08:49 UTC (rev 258)
@@ -118,11 +118,11 @@
)
include_directories(${CMAKE_SOURCE_DIR}/lib ${FREETYPE_INCLUDE_DIRS}
- ${DevIL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
+ ${IL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
add_library(kerosin ${kerosin_LIB_SRCS} ${kerosin_LIB_HDRS})
-target_link_libraries(kerosin ${FREETYPE_LIBRARIES} ${DevIL_LIBRARIES}
+target_link_libraries(kerosin ${FREETYPE_LIBRARIES} ${IL_LIBRARIES}
${SDL_LIBRARY} ${OPENGL_LIBRARIES} ${kerosin_require_libs})
set_target_properties(kerosin PROPERTIES VERSION ${KEROSIN_VERSION}
Modified: trunk/spark/spark/CMakeLists.txt
===================================================================
--- trunk/spark/spark/CMakeLists.txt 2011-03-24 16:29:33 UTC (rev 257)
+++ trunk/spark/spark/CMakeLists.txt 2011-03-24 18:08:49 UTC (rev 258)
@@ -6,7 +6,7 @@
)
include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/utility ${FREETYPE_INCLUDE_DIRS}
- ${DevIL_INCLUDE_DIR})
+ ${IL_INCLUDE_DIR})
add_library(spark ${spark_LIB_SRCS})
Modified: trunk/spark/test/fonttest/CMakeLists.txt
===================================================================
--- trunk/spark/test/fonttest/CMakeLists.txt 2011-03-24 16:29:33 UTC (rev 257)
+++ trunk/spark/test/fonttest/CMakeLists.txt 2011-03-24 18:08:49 UTC (rev 258)
@@ -6,7 +6,7 @@
)
include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
- ${DevIL_INCLUDE_DIR})
+ ${IL_INCLUDE_DIR})
add_executable(fonttest ${fonttest_SRCS})
Modified: trunk/spark/test/inputtest/CMakeLists.txt
===================================================================
--- trunk/spark/test/inputtest/CMakeLists.txt 2011-03-24 16:29:33 UTC (rev 257)
+++ trunk/spark/test/inputtest/CMakeLists.txt 2011-03-24 18:08:49 UTC (rev 258)
@@ -6,7 +6,7 @@
)
include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
- ${DevIL_INCLUDE_DIR})
+ ${IL_INCLUDE_DIR})
add_executable(inputtest ${inputtest_SRCS})
Modified: trunk/spark/test/scenetest/CMakeLists.txt
===================================================================
--- trunk/spark/test/scenetest/CMakeLists.txt 2011-03-24 16:29:33 UTC (rev 257)
+++ trunk/spark/test/scenetest/CMakeLists.txt 2011-03-24 18:08:49 UTC (rev 258)
@@ -9,7 +9,7 @@
)
include_directories(${SDL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS}
- ${DevIL_INCLUDE_DIR})
+ ${IL_INCLUDE_DIR})
if (NOT WIN32)
add_executable(scenetest ${scenetest_SRCS})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
