[Shallows-commits] shallows CMakeLists.txt,1.3,1.4

[Johan S. <jo...@us...>]

Update of /cvsroot/shallows/shallows
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22330

Modified Files:
	CMakeLists.txt 
Log Message:
Updated CMakeLists so it cleanly compiles on VS2005.
Removed bogus regex dependency in Program.cpp
Remover signed/unsigned warnings in OffScreenBuffer
Removed use of sprintf(!) in ShallowsExt

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/shallows/shallows/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CMakeLists.txt	4 Dec 2006 10:26:16 -0000	1.3
--- CMakeLists.txt	19 Jan 2007 13:18:46 -0000	1.4
***************
*** 4,10 ****
--- 4,14 ----
  set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /work/lib)
  set(CMAKE_BUILD_TYPE "Debug" )
+ set(Boost_INCLUDE_DIR "h:/boost/include/boost-1_33_1" )
  
+ find_package(Boost REQUIRED)
  find_package(OpenGL REQUIRED)
  
+ include_directories(include ${Boost_INCLUDE_DIRS})
+ link_libraries(${OPENGL_LIBRARIES})
  # Platform specifics
  if(UNIX)
***************
*** 17,23 ****
  include(CheckIncludeFiles)
  check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
! if(NOT HAVE_BOOST_SHARED_PTR_HPP)
!   message(FATAL_ERROR "shared_ptr not found. Install boost.")
! endif(NOT HAVE_BOOST_SHARED_PTR_HPP)
  
  check_include_file_cxx(Magick++.h HAVE_MAGICK)
--- 21,27 ----
  include(CheckIncludeFiles)
  check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP)
! #if(NOT HAVE_BOOST_SHARED_PTR_HPP)
! #  message(FATAL_ERROR "shared_ptr not found. Install boost.")
! #endif(NOT HAVE_BOOST_SHARED_PTR_HPP)
  
  check_include_file_cxx(Magick++.h HAVE_MAGICK)
***************
*** 26,35 ****
  check_include_files(Cg/cgGL.h HAVE_CGGL)
  
  configure_file(config.h.cmake include/shallows/config.h)
  
  # Define our sources
  file(GLOB SHALLOWS_SRC "src/*cpp")
! include_directories(include)
  #add_library(shallows ${SHALLOWS_SRC})
  add_library(shallows SHARED ${SHALLOWS_SRC})
! SET_SOURCE_FILES_PROPERTIES(${SHALLOWS_SRC} COMPILE_FLAGS -pthread)
\ No newline at end of file
--- 30,44 ----
  check_include_files(Cg/cgGL.h HAVE_CGGL)
  
+ if(WIN32)
+ 	set(DllExport "__declspec( dllexport )" )
+ 	add_definitions(-DNOMINMAX)
+ endif(WIN32)
+  
  configure_file(config.h.cmake include/shallows/config.h)
  
  # Define our sources
  file(GLOB SHALLOWS_SRC "src/*cpp")
! 
  #add_library(shallows ${SHALLOWS_SRC})
  add_library(shallows SHARED ${SHALLOWS_SRC})
! #SET_SOURCE_FILES_PROPERTIES(${SHALLOWS_SRC} COMPILE_FLAGS)
\ No newline at end of file