Revision: 40565
http://brlcad.svn.sourceforge.net/brlcad/?rev=40565&view=rev
Author: erikgreenwald
Date: 2010-09-14 22:16:34 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
wire in isst_gtk
Modified Paths:
--------------
isst/trunk/CMakeLists.txt
Modified: isst/trunk/CMakeLists.txt
===================================================================
--- isst/trunk/CMakeLists.txt 2010-09-14 22:04:42 UTC (rev 40564)
+++ isst/trunk/CMakeLists.txt 2010-09-14 22:16:34 UTC (rev 40565)
@@ -2,6 +2,7 @@
project(ISST)
set(ISST_SDL_SOURCES sdl/main.c sdl/event.c)
+set(ISST_GTK_SOURCES gtk/gui.c gtk/local_worker.c gtk/main.c gtk/net_worker.c)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake-modules")
@@ -16,18 +17,19 @@
if (NOT (SDL_FOUND))
message(STATUS "\tDid not find SDL!")
endif (NOT (SDL_FOUND))
-include_directories(${SDL_INCLUDE_DIR})
-link_libraries(${SDL_LIBRARY})
-if (NOT APPLE)
- link_libraries(SDLmain)
-endif (NOT APPLE)
+#if (NOT APPLE)
+# link_libraries(SDLmain)
+#endif (NOT APPLE)
+find_package(GTK2 2.2 REQUIRED gtk)
+if (NOT GTK2_FOUND)
+ message(STATUS "\tDid not find GTK+ 2!")
+endif (NOT GTK2_FOUND)
+
find_package(OpenGL REQUIRED)
if (NOT OPENGL_FOUND)
message(STATUS "\tDid not find OpenGL!")
endif (NOT OPENGL_FOUND)
-include_directories(${OPENGL_INCLUDE_DIR})
-link_libraries(${OPENGL_gl_LIBRARY})
#Find BRLCAD
find_package ( BRLCAD REQUIRED )
@@ -35,9 +37,14 @@
message(STATUS "\tDid not find BRLCAD!")
RETURN()
endif (NOT BRLCAD_FOUND)
-include_directories(${BRLCAD_INC_DIRS})
-link_libraries(${_BRLCAD_LIBRARY_bu} ${_BRLCAD_LIBRARY_bn}
${_BRLCAD_LIBRARY_rt} ${_BRLCAD_LIBRARY_tie} ${_BRLCAD_LIBRARY_render})
+add_executable(isst_sdl WIN32 MACOSX_BUNDLE ${ISST_SDL_SOURCES})
+add_executable(isst_gtk WIN32 MACOSX_BUNDLE ${ISST_GTK_SOURCES})
+include_directories(${OPENGL_INCLUDE_DIR} ${SDL_INCLUDE_DIR}
${GTK2_INCLUDE_DIRS} ${BRLCAD_INC_DIRS})
+set(MYLIBS ${OPENGL_gl_LIBRARY} ${_BRLCAD_LIBRARY_bu} ${_BRLCAD_LIBRARY_bn}
${_BRLCAD_LIBRARY_rt} ${_BRLCAD_LIBRARY_tie} ${_BRLCAD_LIBRARY_render})
+target_link_libraries(isst_sdl ${SDL_LIBRARY} ${MYLIBS})
+target_link_libraries(isst_gtk ${GTK2_LIBRARIES} ${MYLIBS})
+
set_property(DIRECTORY
PROPERTY COMPILE_DEFINITIONS HAVE_FCNTL_H=${HAVE_FCNTL_H}
PROPERTY COMPILE_DEFINITIONS HAVE_GETOPT=${HAVE_GETOPT}
@@ -45,4 +52,3 @@
PROPERTY COMPILE_DEFINITIONS HAVE_UNISTD_H=${HAVE_UNISTD_H}
PROPERTY COMPILE_DEFINITIONS HAVE_OPENGL)
-add_executable(isst_sdl WIN32 MACOSX_BUNDLE ${ISST_SDL_SOURCES})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
