diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindATK.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindCairo.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindGTK2.cmake | 27 | ||||
| -rw-r--r-- | cmake/modules/FindGlew.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/FindGlib2.cmake | 12 | ||||
| -rw-r--r-- | cmake/modules/FindGstreamer.cmake | 16 | ||||
| -rw-r--r-- | cmake/modules/FindLibXml2.cmake | 2 | ||||
| -rw-r--r-- | cmake/modules/FindOpenGL.cmake.off | 30 |
8 files changed, 63 insertions, 32 deletions
diff --git a/cmake/modules/FindATK.cmake b/cmake/modules/FindATK.cmake index e2ae906..762e144 100644 --- a/cmake/modules/FindATK.cmake +++ b/cmake/modules/FindATK.cmake @@ -3,7 +3,7 @@ FILE(TO_CMAKE_PATH "${ATK_DIR}" TRY2_DIR) FILE(GLOB ATK_DIR ${TRY1_DIR} ${TRY2_DIR}) FIND_PATH(ATK_INCLUDE_DIR atk/atk.h - PATHS ${ATK_DIR}/include /usr/local/include /usr/include + PATHS ${ATK_DIR}/include /usr/local/include/atk-1.0 /usr/include/atk-1.0 ENV INCLUDE DOC "Directory containing atk/atk.h include file") IF (ATK_INCLUDE_DIR) diff --git a/cmake/modules/FindCairo.cmake b/cmake/modules/FindCairo.cmake index ed98f4c..9ad0be4 100644 --- a/cmake/modules/FindCairo.cmake +++ b/cmake/modules/FindCairo.cmake @@ -3,7 +3,7 @@ FILE(TO_CMAKE_PATH "${CAIRO_DIR}" TRY2_DIR) FILE(GLOB CAIRO_DIR ${TRY1_DIR} ${TRY2_DIR}) FIND_PATH(CAIRO_INCLUDE_DIR cairo.h - PATHS ${CAIRO_DIR}/include /usr/local/include /usr/include + PATHS ${CAIRO_DIR}/include /usr/local/include/cairo /usr/include/cairo ENV INCLUDE DOC "Directory containing cairo.h include file") IF (CAIRO_INCLUDE_DIR) diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake index db69a7a..58e8af4 100644 --- a/cmake/modules/FindGTK2.cmake +++ b/cmake/modules/FindGTK2.cmake @@ -3,15 +3,15 @@ FILE(TO_CMAKE_PATH "${GTK2_DIR}" TRY2_DIR) FILE(GLOB GTK_DIR ${TRY1_DIR} ${TRY2_DIR}) FIND_PATH(GTK_gtk_2_INCLUDE_DIR gtk/gtk.h - PATHS ${GTK_DIR}/include /usr/local/include /usr/include + PATHS ${GTK_DIR}/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 ENV INCLUDE DOC "Directory containing gtk/gtk.h include file") FIND_PATH(GTK_gdk_2_INCLUDE_DIR gdk/gdk.h - PATHS ${GTK_DIR}/include /usr/local/include /usr/include + PATHS ${GTK_DIR}/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 ENV INCLUDE DOC "Directory containing gdk/gdk.h include file") FIND_PATH(GTK_gdkconfig_2_INCLUDE_DIR gdkconfig.h - PATHS ${GTK_DIR}/include ${GTK_DIR}/lib/include /usr/local/include /usr/include + PATHS ${GTK_DIR}/include ${GTK_DIR}/lib/include /usr/local/include/gtk-2.0 /usr/include/gtk-2.0 /usr/lib/gtk-2.0/include /usr/local/lib/gtk-2.0/include ENV INCLUDE DOC "Directory containing gdkconfig.h include file") FIND_LIBRARY(GTK_gdk_pixbuf_2_LIBRARY NAMES gdk_pixbuf-2.0 @@ -20,24 +20,25 @@ FIND_LIBRARY(GTK_gdk_pixbuf_2_LIBRARY NAMES gdk_pixbuf-2.0 DOC "gdk_pixbuf library to link with" NO_SYSTEM_ENVIRONMENT_PATH) -FIND_LIBRARY(GTK_gdk_win32_2_LIBRARY NAMES gdk-win32-2.0 - PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib +FIND_LIBRARY(GTK_gdk_2_LIBRARY NAMES gdk-win32-2.0 gdk-x11-2.0 + PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/lib /usr/local/lib ENV LIB - DOC "gdk-win32 library to link with" + DOC "gdk2 library to link with" NO_SYSTEM_ENVIRONMENT_PATH) -FIND_LIBRARY(GTK_gtk_win32_2_LIBRARY NAMES gtk-win32-2.0 - PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib +FIND_LIBRARY(GTK_gtk_2_LIBRARY NAMES gtk-win32-2.0 gtk-x11-2.0 + PATHS ${GTK_DIR}/lib ${GTK_DIR}/bin ${GTK_DIR}/win32/bin ${GTK_DIR}/lib ${GTK_DIR}/win32/lib /usr/lib /usr/local/lib ENV LIB - DOC "gtk-win32 library to link with" - NO_SYSTEM_ENVIRONMENT_PATH) + DOC "gtk2 library to link with" + NO_SYSTEM_ENVIRONMENT_PATH) + IF (GTK_gtk_2_INCLUDE_DIR AND GTK_gdk_2_INCLUDE_DIR AND GTK_gdkconfig_2_INCLUDE_DIR AND - GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_win32_2_LIBRARY AND GTK_gtk_win32_2_LIBRARY) + GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_2_LIBRARY AND GTK_gtk_2_LIBRARY) SET(GTK2_INCLUDE_DIR ${GTK_gtk_2_INCLUDE_DIR} ${GTK_gdk_2_INCLUDE_DIR} ${GTK_gdkconfig_2_INCLUDE_DIR}) list(REMOVE_DUPLICATES GTK2_INCLUDE_DIR) - SET(GTK2_LIBRARIES ${GTK_gdk_pixbuf_2_LIBRARY} ${GTK_gdk_win32_2_LIBRARY} ${GTK_gtk_win32_2_LIBRARY}) + SET(GTK2_LIBRARIES ${GTK_gdk_pixbuf_2_LIBRARY} ${GTK_gdk_2_LIBRARY} ${GTK_gtk_2_LIBRARY}) list(REMOVE_DUPLICATES GTK2_LIBRARIES) SET(GTK2_FOUND TRUE) ENDIF (GTK_gtk_2_INCLUDE_DIR AND GTK_gdk_2_INCLUDE_DIR AND GTK_gdkconfig_2_INCLUDE_DIR AND - GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_win32_2_LIBRARY AND GTK_gtk_win32_2_LIBRARY) + GTK_gdk_pixbuf_2_LIBRARY AND GTK_gdk_2_LIBRARY AND GTK_gtk_2_LIBRARY) diff --git a/cmake/modules/FindGlew.cmake b/cmake/modules/FindGlew.cmake index 2795e07..463d705 100644 --- a/cmake/modules/FindGlew.cmake +++ b/cmake/modules/FindGlew.cmake @@ -4,13 +4,13 @@ FILE(GLOB GLEW_DIR ${TRY1_DIR} ${TRY2_DIR}) FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h PATHS ${GLEW_DIR}/include /usr/local/include /usr/include - ENV INCLUDE DOC "Directory containing glew/glew.h include file") + ENV INCLUDE DOC "Directory containing GL/glew.h include file") FIND_LIBRARY(GLEW_LIBRARY NAMES glew32 GLEW glew32s PATHS ${GLEW_DIR}/bin ${GLEW_DIR}/win32/bin ${GLEW_DIR}/lib ${GLEW_DIR}/win32/lib /usr/local/lib /usr/lib ENV LIB DOC "glew library to link with" - NO_SYSTEM_ENVIRONMENT_PATH) + NO_SYSTEM_ENVIRONMENT_PATH) IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) SET(GLEW_FOUND TRUE) diff --git a/cmake/modules/FindGlib2.cmake b/cmake/modules/FindGlib2.cmake index 8b1e21d..2c63fe6 100644 --- a/cmake/modules/FindGlib2.cmake +++ b/cmake/modules/FindGlib2.cmake @@ -3,18 +3,18 @@ FILE(TO_CMAKE_PATH "${GLIB2_DIR}" TRY2_DIR) FILE(GLOB GLIB2_DIR ${TRY1_DIR} ${TRY2_DIR}) FIND_PATH(GLIB_glib_2_INCLUDE_DIR glib.h - PATHS ${GLIB2_DIR}/include /usr/local/include /usr/include + PATHS ${GLIB2_DIR}/include /usr/local/include/glib-2.0 /usr/include/glib-2.0 ENV INCLUDE DOC "Directory containing glib.h include file") - + FIND_PATH(GLIB_glibconfig_2_INCLUDE_DIR glibconfig.h - PATHS ${GLIB2_DIR}/include ${GLIB2_DIR}/lib/include /usr/local/include /usr/include - ENV INCLUDE DOC "Directory containing glibconfig.h include file") + PATHS ${GLIB2_DIR}/include ${GLIB2_DIR}/lib/include /usr/local/include/glib-2.0 /usr/include/glib-2.0 /usr/lib/glib-2.0/include /usr/local/lib/glib-2.0/include + ENV INCLUDE DOC "Directory containing glibconfig.h include file") FIND_LIBRARY(GLIB_glib_2_LIBRARY NAMES glib-2.0 PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib ENV LIB DOC "glib library to link with" - NO_SYSTEM_ENVIRONMENT_PATH) + NO_SYSTEM_ENVIRONMENT_PATH) FIND_LIBRARY(GLIB_gmodule_2_LIBRARY NAMES gmodule-2.0 PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib @@ -32,7 +32,7 @@ FIND_LIBRARY(GLIB_gthread_2_LIBRARY NAMES gthread-2.0 PATHS ${GLIB2_DIR}/bin ${GLIB2_DIR}/win32/bin ${GLIB2_DIR}/lib ${GLIB2_DIR}/win32/lib /usr/local/lib /usr/lib ENV LIB DOC "gthread library to link with" - NO_SYSTEM_ENVIRONMENT_PATH) + NO_SYSTEM_ENVIRONMENT_PATH) IF (GLIB_glib_2_INCLUDE_DIR AND GLIB_glibconfig_2_INCLUDE_DIR AND GLIB_glib_2_LIBRARY AND GLIB_gmodule_2_LIBRARY AND GLIB_gobject_2_LIBRARY AND GLIB_gthread_2_LIBRARY) SET(GLIB2_INCLUDE_DIR ${GLIB_glib_2_INCLUDE_DIR} ${GLIB_glibconfig_2_INCLUDE_DIR}) diff --git a/cmake/modules/FindGstreamer.cmake b/cmake/modules/FindGstreamer.cmake index 11787fb..8a9d7e0 100644 --- a/cmake/modules/FindGstreamer.cmake +++ b/cmake/modules/FindGstreamer.cmake @@ -3,12 +3,12 @@ FILE(TO_CMAKE_PATH "${GSTREAMER_DIR}" TRY2_DIR) FILE(GLOB GSTREAMER_DIR ${TRY1_DIR} ${TRY2_DIR}) FIND_PATH(GSTREAMER_gst_INCLUDE_DIR gst/gst.h - PATHS ${GSTREAMER_DIR}/include /usr/local/include /usr/include + PATHS ${GSTREAMER_DIR}/include /usr/local/include/gstreamer-0.10 /usr/include/gstreamer-0.10 ENV INCLUDE DOC "Directory containing gst/gst.h include file") - + FIND_PATH(GSTREAMER_gstconfig_INCLUDE_DIR gst/gstconfig.h - PATHS ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/lib/include /usr/local/include /usr/include - ENV INCLUDE DOC "Directory containing gst/gstconfig.h include file") + PATHS ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/lib/include /usr/local/include/gstreamer-0.10 /usr/include/gstreamer-0.10 /usr/local/lib/include/gstreamer-0.10 /usr/lib/include/gstreamer-0.10 + ENV INCLUDE DOC "Directory containing gst/gstconfig.h include file") FIND_LIBRARY(GSTREAMER_gstaudio_LIBRARY NAMES gstaudio-0.10 libgstaudio-0.10 PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib @@ -21,7 +21,7 @@ FIND_LIBRARY(GSTREAMER_gstbase_LIBRARY NAMES gstbase-0.10 libgstbase-0.10 ENV LIB DOC "gstbase library to link with" NO_SYSTEM_ENVIRONMENT_PATH) - + FIND_LIBRARY(GLIB_gstcdda_LIBRARY NAMES gstcdda-0.10 libgstcdda-0.10 PATHS ${GSTREAMER_DIR}/bin ${GSTREAMER_DIR}/win32/bin ${GSTREAMER_DIR}/bin/bin ${GSTREAMER_DIR}/lib ${GSTREAMER_DIR}/win32/lib /usr/local/lib /usr/lib ENV LIB @@ -107,7 +107,7 @@ FIND_LIBRARY(GSTREAMER_gstvideo_LIBRARY NAMES gstvideo-0.10 libgstvideo-0.10 NO_SYSTEM_ENVIRONMENT_PATH) -IF (GSTREAMER_gst_INCLUDE_DIR AND GSTREAMER_gstconfig_INCLUDE_DIR AND +IF (GSTREAMER_gst_INCLUDE_DIR AND GSTREAMER_gstconfig_INCLUDE_DIR AND GSTREAMER_gstaudio_LIBRARY AND GSTREAMER_gstbase_LIBRARY AND GLIB_gstcdda_LIBRARY AND GSTREAMER_gstcontroller_LIBRARY AND GSTREAMER_gstdataprotocol_LIBRARY AND GSTREAMER_gstinterfaces_LIBRARY AND GSTREAMER_gstnet_LIBRARY AND GSTREAMER_gstnetbuffer_LIBRARY AND GSTREAMER_gstpbutils_LIBRARY AND GSTREAMER_gstreamer_LIBRARY AND @@ -115,14 +115,14 @@ IF (GSTREAMER_gst_INCLUDE_DIR AND GSTREAMER_gstconfig_INCLUDE_DIR AND GSTREAMER_gsttag_LIBRARY AND GSTREAMER_gstvideo_LIBRARY) SET(GSTREAMER_INCLUDE_DIR ${GSTREAMER_gst_INCLUDE_DIR} ${GSTREAMER_gstconfig_INCLUDE_DIR}) list(REMOVE_DUPLICATES GSTREAMER_INCLUDE_DIR) - SET(GSTREAMER_LIBRARIES ${GSTREAMER_gstaudio_LIBRARY} ${GSTREAMER_gstbase_LIBRARY} ${GLIB_gstcdda_LIBRARY} + SET(GSTREAMER_LIBRARIES ${GSTREAMER_gstaudio_LIBRARY} ${GSTREAMER_gstbase_LIBRARY} ${GLIB_gstcdda_LIBRARY} ${GSTREAMER_gstcontroller_LIBRARY} ${GSTREAMER_gstdataprotocol_LIBRARY} ${GSTREAMER_gstinterfaces_LIBRARY} ${GSTREAMER_gstnet_LIBRARY} ${GSTREAMER_gstnetbuffer_LIBRARY} ${GSTREAMER_gstpbutils_LIBRARY} ${GSTREAMER_gstreamer_LIBRARY} ${GSTREAMER_gstriff_LIBRARY} ${GSTREAMER_gstrtp_LIBRARY} ${GSTREAMER_gstrtsp_LIBRARY} ${GSTREAMER_gstsdp_LIBRARY} ${GSTREAMER_gsttag_LIBRARY} ${GSTREAMER_gstvideo_LIBRARY}) list(REMOVE_DUPLICATES GSTREAMER_LIBRARIES) SET(GSTREAMER_FOUND TRUE) -ENDIF (GSTREAMER_gst_INCLUDE_DIR AND GSTREAMER_gstconfig_INCLUDE_DIR AND +ENDIF (GSTREAMER_gst_INCLUDE_DIR AND GSTREAMER_gstconfig_INCLUDE_DIR AND GSTREAMER_gstaudio_LIBRARY AND GSTREAMER_gstbase_LIBRARY AND GLIB_gstcdda_LIBRARY AND GSTREAMER_gstcontroller_LIBRARY AND GSTREAMER_gstdataprotocol_LIBRARY AND GSTREAMER_gstinterfaces_LIBRARY AND GSTREAMER_gstnet_LIBRARY AND GSTREAMER_gstnetbuffer_LIBRARY AND GSTREAMER_gstpbutils_LIBRARY AND GSTREAMER_gstreamer_LIBRARY AND diff --git a/cmake/modules/FindLibXml2.cmake b/cmake/modules/FindLibXml2.cmake index 686db32..344e474 100644 --- a/cmake/modules/FindLibXml2.cmake +++ b/cmake/modules/FindLibXml2.cmake @@ -3,7 +3,7 @@ FILE(TO_CMAKE_PATH "${LIBXML2_DIR}" TRY2_DIR) FILE(GLOB LIBXML2_DIR ${TRY1_DIR} ${TRY2_DIR}) FIND_PATH(LIBXML2_INCLUDE_DIR libxml/parser.h - PATHS ${LIBXML2_DIR}/include /usr/local/include /usr/include + PATHS ${LIBXML2_DIR}/include /usr/local/include/libxml2 /usr/include/libxml2 ENV INCLUDE DOC "Directory containing libxml/parser.h include file") IF (LIBXML2_INCLUDE_DIR) diff --git a/cmake/modules/FindOpenGL.cmake.off b/cmake/modules/FindOpenGL.cmake.off new file mode 100644 index 0000000..3dc7dd2 --- /dev/null +++ b/cmake/modules/FindOpenGL.cmake.off @@ -0,0 +1,30 @@ +FILE(TO_CMAKE_PATH "$ENV{OPENGL_DIR}" TRY1_DIR) +FILE(TO_CMAKE_PATH "${OPENGL_DIR}" TRY2_DIR) +FILE(GLOB OPENGL_DIR ${TRY1_DIR} ${TRY2_DIR}) + +FIND_PATH(OPENGL_gl_INCLUDE_DIR GL/gl.h + PATHS ${OPENGL_DIR}/include /usr/local/include /usr/include + ENV INCLUDE DOC "Directory containing GL/gl.h include file") + +FIND_PATH(OPENGL_glu_INCLUDE_DIR GL/glu.h + PATHS ${OPENGL_DIR}/include /usr/local/include /usr/include + ENV INCLUDE DOC "Directory containing GL/glu.h include file") + +FIND_LIBRARY(OPENGL_gl_LIBRARY NAMES opengl32 GL + PATHS ${OPENGL_DIR}/bin ${OPENGL_DIR}/win32/bin ${OPENGL_DIR}/lib ${OPENGL_DIR}/win32/lib /usr/local/lib /usr/lib + ENV LIB + DOC "gl library to link with" + NO_SYSTEM_ENVIRONMENT_PATH) + +FIND_LIBRARY(OPENGL_glu_LIBRARY NAMES glu32 GLU + PATHS ${OPENGL_DIR}/bin ${OPENGL_DIR}/win32/bin ${OPENGL_DIR}/lib ${OPENGL_DIR}/win32/lib /usr/local/lib /usr/lib + ENV LIB + DOC "glu library to link with" + NO_SYSTEM_ENVIRONMENT_PATH) + +IF (OPENGL_gl_INCLUDE_DIR AND OPENGL_glu_INCLUDE_DIR AND OPENGL_gl_LIBRARY AND OPENGL_glu_LIBRARY) + SET(OPENGL_INCLUDE_DIR ${OPENGL_gl_INCLUDE_DIR} ${OPENGL_glu_INCLUDE_DIR}) + list(REMOVE_DUPLICATES OPENGL_INCLUDE_DIR) + SET(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) + list(REMOVE_DUPLICATES OPENGL_LIBRARIES) +ENDIF (OPENGL_gl_INCLUDE_DIR AND OPENGL_glu_INCLUDE_DIR AND OPENGL_gl_LIBRARY AND OPENGL_glu_LIBRARY) |