X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=CMakeLists.txt;h=9d9600ae1aa95b80bb75e1c614938f8a3250a52f;hb=HEAD;hp=4d6e1f279cd2af716efb47ec145e074ee719ec56;hpb=7ff5f34c5ec3b44e3bc6a022122fc101ed8f584f;p=freeglut diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d6e1f2..9d9600a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,19 +16,19 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) # setup version numbers -# TODO: Update these for each release! +# XXX: Update these for each release! set(VERSION_MAJOR 3) -set(VERSION_MINOR 0) -set(VERSION_PATCH 0) +set(VERSION_MINOR 2) +set(VERSION_PATCH 2) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) # Update fg_version.h to match the versions number here in cmake CONFIGURE_FILE(src/fg_version.h.in src/fg_version.h) -# shared lib version numbers (change before release) +# shared lib version numbers (XXX: change before release) set(SO_MAJOR 3) # increment on backwards incompatible API/ABI changes -set(SO_MINOR 10) # increment on backwards compatible or internal changes -set(SO_REV 0) # if nothing else changed increment this +set(SO_MINOR 11) # increment on backwards compatible API additions +set(SO_REV 1) # increment if only internal changes happened between releases # FREEGLUT_BUILD_SHARED_LIBS is already a standard CMake variable, but we need to # re-declare it here so it will show up in the GUI. @@ -51,7 +51,11 @@ ELSE() ENDIF() # OpenGL ES support -OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF) +IF(ANDROID) + OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" ON) +ELSE() + OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF) +ENDIF() # option to build either as "glut" (ON) or "freeglut" (OFF) IF(WIN32) @@ -68,10 +72,15 @@ ENDIF() SET(FREEGLUT_HEADERS include/GL/freeglut.h + include/GL/freeglut_ucall.h include/GL/freeglut_ext.h include/GL/freeglut_std.h - include/GL/glut.h ) +IF(FREEGLUT_REPLACE_GLUT) + LIST(APPEND FREEGLUT_HEADERS + include/GL/glut.h + ) +ENDIF() SET(FREEGLUT_SRCS ${FREEGLUT_HEADERS} src/fg_callbacks.c @@ -86,6 +95,7 @@ SET(FREEGLUT_SRCS src/fg_init.c src/fg_init.h src/fg_internal.h + src/fg_callback_macros.h src/fg_input_devices.c src/fg_joystick.c src/fg_main.c @@ -306,8 +316,8 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC) INCLUDE(CheckIncludeFiles) IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) FIND_PACKAGE(X11 REQUIRED) - INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR}) - LIST(APPEND LIBS ${X11_LIBRARIES}) + INCLUDE_DIRECTORIES(${X11_X11_INCLUDE_PATH}) + LIST(APPEND LIBS ${X11_X11_LIB}) IF(X11_Xrandr_FOUND) SET(HAVE_X11_EXTENSIONS_XRANDR_H TRUE) LIST(APPEND LIBS ${X11_Xrandr_LIB}) @@ -320,6 +330,8 @@ IF(UNIX AND NOT(ANDROID OR BLACKBERRY OR FREEGLUT_WAYLAND)) # Needed for multi-touch: CHECK_INCLUDE_FILES("${X11_Xinput_INCLUDE_PATH}/X11/extensions/XInput2.h" HAVE_X11_EXTENSIONS_XINPUT2_H) LIST(APPEND LIBS ${X11_Xinput_LIB}) + ELSE() + MESSAGE(FATAL_ERROR "Missing X11's XInput.h (X11/extensions/XInput.h)") ENDIF() ENDIF() IF(ANDROID) @@ -340,6 +352,7 @@ ENDIF() INCLUDE(CheckFunctionExists) INCLUDE(CheckTypeSize) +INCLUDE(CheckCCompilerFlag) CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H) CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H) @@ -428,18 +441,18 @@ ELSE() # or special-cased FreeGLUT long ago (e.g. .so.4 on OpenBSD), so # the lack of support for current:revision:age in CMake should # not be a problem. - # - the output library should be named glut so it'll be linkable with -lglut - # (unless FREEGLUT_REPLACE_GLUT is false). + # - the output library should be named glut so it'll be linkable with -lglut + # (unless FREEGLUT_REPLACE_GLUT is false). # - the shared library should link to the dependency libraries so that the user # won't have to link them explicitly (they shouldn't have to know that we depend # on Xrandr or Xxf86vm) IF(FREEGLUT_GLES) - SET(LIBNAME freeglut-gles) + SET(LIBNAME freeglut-gles) ELSE() - IF(FREEGLUT_REPLACE_GLUT) - SET(LIBNAME glut) - ENDIF() - ENDIF() + IF(FREEGLUT_REPLACE_GLUT) + SET(LIBNAME glut) + ENDIF() + ENDIF() IF(FREEGLUT_BUILD_SHARED_LIBS) SET_TARGET_PROPERTIES(freeglut PROPERTIES VERSION ${SO_MAJOR}.${SO_MINOR}.${SO_REV} SOVERSION ${SO_MAJOR} OUTPUT_NAME ${LIBNAME}) @@ -455,8 +468,17 @@ ELSE() # '-O0 -gstabs+' helps the currently buggy GDB port # Too late to manipulate ENV: SET(ENV{CFLAGS} "$ENV{CFLAGS} -mandroid") # Not using _INIT variables, they seem to be used internally only - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mandroid") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -gstabs+") + IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mandroid") + ENDIF() + CHECK_C_COMPILER_FLAG(-O0 HAVE_O0_FLAG) + IF(HAVE_O0_FLAG) + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0") + ENDIF() + CHECK_C_COMPILER_FLAG(-gstabs+ HAVE_GSTABSP_FLAG) + IF(HAVE_gstabsp_FLAG) + SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -gstabs+") + ENDIF() ENDIF() ENDIF() IF(FREEGLUT_BUILD_SHARED_LIBS) @@ -476,10 +498,17 @@ IF(FREEGLUT_BUILD_SHARED_LIBS) INCLUDES DESTINATION include ) IF(INSTALL_PDB) - INSTALL(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/freeglut${CMAKE_DEBUG_POSTFIX}.pdb - DESTINATION bin - CONFIGURATIONS Debug - COMPONENT Devel) + IF(CMAKE_GENERATOR MATCHES "^Visual Studio") + INSTALL(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/freeglut${CMAKE_DEBUG_POSTFIX}.pdb + DESTINATION bin + CONFIGURATIONS Debug + COMPONENT Devel) + ELSE() + INSTALL(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/freeglut${CMAKE_DEBUG_POSTFIX}.pdb + DESTINATION bin + CONFIGURATIONS Debug + COMPONENT Devel) + ENDIF() ENDIF() ENDIF() IF(FREEGLUT_BUILD_STATIC_LIBS) @@ -538,13 +567,13 @@ ADD_DEMO(shapes progs/demos/shapes/shapes.c progs/demos/shapes/glmatrix.h progs/demos/shapes/glmatrix.c) ADD_DEMO(smooth_opengl3 progs/demos/smooth_opengl3/smooth_opengl3.c) -IF(UNIX) - ADD_DEMO(spaceball progs/demos/spaceball/spaceball.c - progs/demos/spaceball/vmath.c - progs/demos/spaceball/vmath.h) -ENDIF() +ADD_DEMO(spaceball progs/demos/spaceball/spaceball.c + progs/demos/spaceball/vmath.c + progs/demos/spaceball/vmath.h) ADD_DEMO(subwin progs/demos/subwin/subwin.c) ADD_DEMO(timer progs/demos/timer/timer.c) +ADD_DEMO(timer_callback progs/demos/timer_callback/timer.c) +ADD_DEMO(keyboard progs/demos/keyboard/keyboard.c) @@ -580,6 +609,9 @@ SET(PC_FILENAME "${LIBNAME}.pc") IF(FREEGLUT_GLES) SET(PC_CFLAGS "-DFREEGLUT_GLES") ENDIF() +IF(FREEGLUT_BUILD_STATIC_LIBS) + LIST(APPEND PC_CFLAGS -DFREEGLUT_STATIC) +ENDIF() CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/freeglut.pc.in ${CMAKE_BINARY_DIR}/freeglut.pc @ONLY) INSTALL(FILES ${CMAKE_BINARY_DIR}/freeglut.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ RENAME ${PC_FILENAME} COMPONENT Devel) # TODO: change the library and .pc name when building for GLES, @@ -601,7 +633,7 @@ CONFIGURE_FILE(FreeGLUTConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/FreeGLUT/FreeGLUTConfig.cmake" @ONLY ) -SET(ConfigPackageLocation lib/cmake/FreeGLUT) +SET(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/FreeGLUT) INSTALL(EXPORT FreeGLUTTargets FILE FreeGLUTTargets.cmake NAMESPACE FreeGLUT::