Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[279] trunk
|
From: <he...@us...> - 2011-04-30 21:27:52
|
Revision: 279
http://simspark.svn.sourceforge.net/simspark/?rev=279&view=rev
Author: hedayat
Date: 2011-04-30 21:27:46 +0000 (Sat, 30 Apr 2011)
Log Message:
-----------
Removed additional .cmake files (FindFreetype and FindZLIB)
Added AdditionalSearchPaths.cmake to add search paths so that CMake's own FindMODULE's work with our setup
Some cleanup
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/windows/install_extra.nsi
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
Added Paths:
-----------
trunk/rcssserver3d/cmake/AdditionalSearchPaths.cmake
trunk/spark/cmake/AdditionalSearchPaths.cmake
Removed Paths:
-------------
trunk/rcssserver3d/cmake/FindFreetype.cmake
trunk/spark/cmake/FindFreetype.cmake
trunk/spark/cmake/FindZLIB.cmake
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2011-04-29 18:46:08 UTC (rev 278)
+++ trunk/rcssserver3d/CMakeLists.txt 2011-04-30 21:27:46 UTC (rev 279)
@@ -10,7 +10,6 @@
check_include_file("arpa/inet.h" HAVE_ARPA_INET_H)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
-set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" "C:/Program Files (x86)/SDL/" C:/SDL/)
if (WIN32)
set(Boost_USE_STATIC_LIBS ON)
@@ -18,6 +17,8 @@
set(Boost_USE_STATIC_RUNTIME OFF)
endif (WIN32)
+include(AdditionalSearchPaths)
+
find_package(Spark REQUIRED)
find_package(Freetype REQUIRED)
find_package(Boost REQUIRED)
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2011-04-29 18:46:08 UTC (rev 278)
+++ trunk/rcssserver3d/ChangeLog 2011-04-30 21:27:46 UTC (rev 279)
@@ -1,3 +1,16 @@
+2011-05-01 Hedayat Vatankhah <hed...@gm...>
+
+ * CMakeLists.txt:
+ - include AdditionalSearchPaths.cmake
+
+ * cmake/AdditionalSearchPaths.cmake:
+ - sets up additional search paths under Windows to find dependencies in
+ common directories and the ones documented on the wiki
+
+ * cmake/FindFreetype.cmake:
+ - removed; and additional search paths have been added to
+ AdditionalSearchPaths.cmake file
+
2011-04-29 Hedayat Vatankhah <hed...@gm...>
* CMakeLists.txt:
Added: trunk/rcssserver3d/cmake/AdditionalSearchPaths.cmake
===================================================================
--- trunk/rcssserver3d/cmake/AdditionalSearchPaths.cmake (rev 0)
+++ trunk/rcssserver3d/cmake/AdditionalSearchPaths.cmake 2011-04-30 21:27:46 UTC (rev 279)
@@ -0,0 +1,29 @@
+if (WIN32)
+ set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/
+ "C:/Program Files/SDL/"
+ "C:/Program Files (x86)/SDL/"
+ C:/SDL/
+ )
+ set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH}
+ C:/Library/
+ C:/Library/ruby/bin
+ )
+ set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH}
+ C:/Library/include
+ C:/Library/boost
+ C:/library/devil/include
+ "C:/Program Files/GnuWin32/include"
+ "C:/Program Files (x86)/GnuWin32/include"
+ C:/library/GnuWin32/include
+ C:/GnuWin32/include
+ )
+ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
+ C:/Library/lib
+ C:/Library/boost
+ C:/library/devil
+ "C:/Program Files/GnuWin32"
+ "C:/Program Files (x86)/GnuWin32"
+ C:/library/GnuWin32/
+ C:/GnuWin32/
+ )
+endif (WIN32)
Deleted: trunk/rcssserver3d/cmake/FindFreetype.cmake
===================================================================
--- trunk/rcssserver3d/cmake/FindFreetype.cmake 2011-04-29 18:46:08 UTC (rev 278)
+++ trunk/rcssserver3d/cmake/FindFreetype.cmake 2011-04-30 21:27:46 UTC (rev 279)
@@ -1,94 +0,0 @@
-# - Locate FreeType library
-# This module defines
-# FREETYPE_LIBRARIES, the library to link against
-# FREETYPE_FOUND, if false, do not try to link to FREETYPE
-# FREETYPE_INCLUDE_DIRS, where to find headers.
-# This is the concatenation of the paths:
-# FREETYPE_INCLUDE_DIR_ft2build
-# FREETYPE_INCLUDE_DIR_freetype2
-#
-# $FREETYPE_DIR is an environment variable that would
-# correspond to the ./configure --prefix=$FREETYPE_DIR
-# used in building FREETYPE.
-
-# Created by Eric Wing.
-# Modifications by Alexander Neundorf.
-# This file has been renamed to "FindFreetype.cmake" instead of the correct
-# "FindFreeType.cmake" in order to be compatible with the one from KDE4, Alex.
-
-# Ugh, FreeType seems to use some #include trickery which
-# makes this harder than it should be. It looks like they
-# put ft2build.h in a common/easier-to-find location which
-# then contains a #include to a more specific header in a
-# more specific location (#include <freetype/config/ftheader.h>).
-# Then from there, they need to set a bunch of #define's
-# so you can do something like:
-# #include FT_FREETYPE_H
-# Unfortunately, using CMake's mechanisms like INCLUDE_DIRECTORIES()
-# wants explicit full paths and this trickery doesn't work too well.
-# I'm going to attempt to cut out the middleman and hope
-# everything still works.
-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
- HINTS
- $ENV{FREETYPE_DIR}
- PATH_SUFFIXES include
- PATHS
- /usr/local/X11R6/include
- /usr/local/X11/include
- /usr/X11/include
- /sw/include
- /opt/local/include
- /usr/freeware/include
- C:/library/GnuWin32/include
- "C:/Program Files/GnuWin32/include"
- "C:/Program Files (x86)/GnuWin32/include"
- C:/GnuWin32/include
-)
-
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
- HINTS
- $ENV{FREETYPE_DIR}/include/freetype2
- PATHS
- /usr/local/X11R6/include
- /usr/local/X11/include
- /usr/X11/include
- /sw/include
- /opt/local/include
- /usr/freeware/include
- C:/library/GnuWin32/include/freetype2
- "C:/Program Files/GnuWin32/include/freetype2"
- "C:/Program Files (x86)/GnuWin32/include/freetype2"
- C:/GnuWin32/include/freetype2
- PATH_SUFFIXES freetype2
-)
-
-FIND_LIBRARY(FREETYPE_LIBRARY
- NAMES freetype libfreetype freetype219
- HINTS
- $ENV{FREETYPE_DIR}
- PATH_SUFFIXES lib64 lib
- PATHS
- /usr/local/X11R6
- /usr/local/X11
- /usr/X11
- /sw
- /usr/freeware
- C:/library/GnuWin32/lib
- "C:/Program Files/GnuWin32/lib"
- "C:/Program Files (x86)/GnuWin32/lib"
- C:/GnuWin32/lib
-)
-
-# set the user variables
-IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
- SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
-ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
-SET(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
-
-# handle the QUIETLY and REQUIRED arguments and set FREETYPE_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype DEFAULT_MSG FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS)
-
-
-MARK_AS_ADVANCED(FREETYPE_LIBRARY FREETYPE_INCLUDE_DIR_freetype2 FREETYPE_INCLUDE_DIR_ft2build)
\ No newline at end of file
Modified: trunk/rcssserver3d/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/rcssserver3d/CMakeLists.txt 2011-04-29 18:46:08 UTC (rev 278)
+++ trunk/rcssserver3d/rcssserver3d/CMakeLists.txt 2011-04-30 21:27:46 UTC (rev 279)
@@ -36,4 +36,4 @@
${CMAKE_CURRENT_BINARY_DIR}/simspark DESTINATION ${BINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE)
-endif (NOT WIN32)
\ No newline at end of file
+endif (NOT WIN32)
Modified: trunk/rcssserver3d/windows/install_extra.nsi
===================================================================
--- trunk/rcssserver3d/windows/install_extra.nsi 2011-04-29 18:46:08 UTC (rev 278)
+++ trunk/rcssserver3d/windows/install_extra.nsi 2011-04-30 21:27:46 UTC (rev 279)
@@ -8,6 +8,7 @@
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\RCSSMonitor3D.lnk" "$INSTDIR\bin\rcssmonitor3d.cmd"
${endif}
+
WriteRegExpandStr HKLM 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' 'RCSSSERVER3D_DIR' '$INSTDIR'
ClearErrors
FileOpen $0 $INSTDIR\bin\rcssserver3d.cmd w
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2011-04-29 18:46:08 UTC (rev 278)
+++ trunk/spark/CMakeLists.txt 2011-04-30 21:27:46 UTC (rev 279)
@@ -36,7 +36,6 @@
endif (NOT USE_COREFOUNDATION STREQUAL "OFF")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
-set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/ "C:/Program Files/SDL/" "C:/Program Files (x86)/SDL/" C:/SDL/)
if (WIN32)
set(Boost_USE_STATIC_LIBS ON)
@@ -44,6 +43,8 @@
set(Boost_USE_STATIC_RUNTIME OFF)
endif (WIN32)
+include(AdditionalSearchPaths)
+
find_package(Ruby REQUIRED)
find_package(Freetype REQUIRED)
find_package(DevIL REQUIRED)
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2011-04-29 18:46:08 UTC (rev 278)
+++ trunk/spark/ChangeLog 2011-04-30 21:27:46 UTC (rev 279)
@@ -1,3 +1,17 @@
+2011-05-01 Hedayat Vatankhah <hed...@gm...>
+
+ * CMakeLists.txt:
+ - include AdditionalSearchPaths.cmake
+
+ * cmake/AdditionalSearchPaths.cmake:
+ - sets up additional search paths under Windows to find dependencies in
+ common directories and the ones documented on the wiki
+
+ * cmake/FindZLIB.cmake:
+ * cmake/FindFreetype.cmake:
+ - removed; and additional search paths have been added to
+ AdditionalSearchPaths.cmake file
+
2011-04-29 Hedayat Vatankhah <hed...@gm...>
* lib/zeitgeist/scriptserver/gcvalue.cpp:
Added: trunk/spark/cmake/AdditionalSearchPaths.cmake
===================================================================
--- trunk/spark/cmake/AdditionalSearchPaths.cmake (rev 0)
+++ trunk/spark/cmake/AdditionalSearchPaths.cmake 2011-04-30 21:27:46 UTC (rev 279)
@@ -0,0 +1,35 @@
+if (WIN32)
+ set(ENV{SDLDIR} $ENV{SDLDIR} C:/library/SDL/
+ "C:/Program Files/SDL/"
+ "C:/Program Files (x86)/SDL/"
+ C:/SDL/
+ )
+ set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH}
+ C:/Library/
+ C:/Library/ruby/bin
+ )
+ set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH}
+ C:/Library/include
+ C:/Library/boost
+ C:/library/devil/include
+ "C:/Program Files/GnuWin32/include"
+ "C:/Program Files (x86)/GnuWin32/include"
+ C:/library/GnuWin32/include
+ C:/GnuWin32/include
+ C:/library/zlib123/include
+ "C:/Program Files/zlib123/include"
+ "C:/Program Files (x86)/zlib123/include"
+ )
+ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}
+ C:/Library/lib
+ C:/Library/boost
+ C:/library/devil
+ "C:/Program Files/GnuWin32"
+ "C:/Program Files (x86)/GnuWin32"
+ C:/library/GnuWin32/
+ C:/GnuWin32/
+ C:/library/zlib123/
+ "C:/Program Files/zlib123/"
+ "C:/Program Files (x86)/zlib123/"
+ )
+endif (WIN32)
Deleted: trunk/spark/cmake/FindFreetype.cmake
===================================================================
--- trunk/spark/cmake/FindFreetype.cmake 2011-04-29 18:46:08 UTC (rev 278)
+++ trunk/spark/cmake/FindFreetype.cmake 2011-04-30 21:27:46 UTC (rev 279)
@@ -1,94 +0,0 @@
-# - Locate FreeType library
-# This module defines
-# FREETYPE_LIBRARIES, the library to link against
-# FREETYPE_FOUND, if false, do not try to link to FREETYPE
-# FREETYPE_INCLUDE_DIRS, where to find headers.
-# This is the concatenation of the paths:
-# FREETYPE_INCLUDE_DIR_ft2build
-# FREETYPE_INCLUDE_DIR_freetype2
-#
-# $FREETYPE_DIR is an environment variable that would
-# correspond to the ./configure --prefix=$FREETYPE_DIR
-# used in building FREETYPE.
-
-# Created by Eric Wing.
-# Modifications by Alexander Neundorf.
-# This file has been renamed to "FindFreetype.cmake" instead of the correct
-# "FindFreeType.cmake" in order to be compatible with the one from KDE4, Alex.
-
-# Ugh, FreeType seems to use some #include trickery which
-# makes this harder than it should be. It looks like they
-# put ft2build.h in a common/easier-to-find location which
-# then contains a #include to a more specific header in a
-# more specific location (#include <freetype/config/ftheader.h>).
-# Then from there, they need to set a bunch of #define's
-# so you can do something like:
-# #include FT_FREETYPE_H
-# Unfortunately, using CMake's mechanisms like INCLUDE_DIRECTORIES()
-# wants explicit full paths and this trickery doesn't work too well.
-# I'm going to attempt to cut out the middleman and hope
-# everything still works.
-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
- HINTS
- $ENV{FREETYPE_DIR}
- PATH_SUFFIXES include
- PATHS
- /usr/local/X11R6/include
- /usr/local/X11/include
- /usr/X11/include
- /sw/include
- /opt/local/include
- /usr/freeware/include
- C:/library/GnuWin32/include
- "C:/Program Files/GnuWin32/include"
- "C:/Program Files (x86)/GnuWin32/include"
- C:/GnuWin32/include
-)
-
-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
- HINTS
- $ENV{FREETYPE_DIR}/include/freetype2
- PATHS
- /usr/local/X11R6/include
- /usr/local/X11/include
- /usr/X11/include
- /sw/include
- /opt/local/include
- /usr/freeware/include
- C:/library/GnuWin32/include/freetype2
- "C:/Program Files/GnuWin32/include/freetype2"
- "C:/Program Files (x86)/GnuWin32/include/freetype2"
- C:/GnuWin32/include/freetype2
- PATH_SUFFIXES freetype2
-)
-
-FIND_LIBRARY(FREETYPE_LIBRARY
- NAMES freetype libfreetype freetype219
- HINTS
- $ENV{FREETYPE_DIR}
- PATH_SUFFIXES lib64 lib
- PATHS
- /usr/local/X11R6
- /usr/local/X11
- /usr/X11
- /sw
- /usr/freeware
- C:/library/GnuWin32/lib
- "C:/Program Files/GnuWin32/lib"
- "C:/Program Files (x86)/GnuWin32/lib"
- C:/GnuWin32/lib
-)
-
-# set the user variables
-IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
- SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
-ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
-SET(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
-
-# handle the QUIETLY and REQUIRED arguments and set FREETYPE_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Freetype DEFAULT_MSG FREETYPE_LIBRARY FREETYPE_INCLUDE_DIRS)
-
-
-MARK_AS_ADVANCED(FREETYPE_LIBRARY FREETYPE_INCLUDE_DIR_freetype2 FREETYPE_INCLUDE_DIR_ft2build)
\ No newline at end of file
Deleted: trunk/spark/cmake/FindZLIB.cmake
===================================================================
--- trunk/spark/cmake/FindZLIB.cmake 2011-04-29 18:46:08 UTC (rev 278)
+++ trunk/spark/cmake/FindZLIB.cmake 2011-04-30 21:27:46 UTC (rev 279)
@@ -1,44 +0,0 @@
-# - Find zlib
-# Find the native ZLIB includes and library
-#
-# ZLIB_INCLUDE_DIR - where to find zlib.h, etc.
-# ZLIB_LIBRARIES - List of libraries when using zlib.
-# ZLIB_FOUND - True if zlib found.
-
-
-IF (ZLIB_INCLUDE_DIR)
- # Already in cache, be silent
- SET(ZLIB_FIND_QUIETLY TRUE)
-ENDIF (ZLIB_INCLUDE_DIR)
-
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h
- $ENV{ZLIB_DIR}
- C:/library/
- C:/
- "C:/Program Files/"
- "C:/Program Files (x86)/"
- PATH_SUFFIXES zlib123
-)
-
-SET(ZLIB_NAMES z zlib zdll zlib1)
-FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES}
- $ENV{ZLIB_DIR}
- C:/library/zlib123/
- C:/zlib123/
- "C:/Program Files/zlib123/"
- "C:/Program Files (x86)/zlib123/"
- PATH_SUFFIXES projects/visualc6/Win32_DLL_Release
-)
-
-# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-
-IF(ZLIB_FOUND)
- SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
-ELSE(ZLIB_FOUND)
- SET( ZLIB_LIBRARIES )
-ENDIF(ZLIB_FOUND)
-
-MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
