From c751a9179db306494d9ac1a0affe9465ebbbaf2a Mon Sep 17 00:00:00 2001 From: dcnieho Date: Sat, 11 Jul 2015 21:26:48 +0000 Subject: [PATCH 1/3] Fix compilation on Linux. Commit ce15044f7362943aee7d465bf20310ba02991dae introduced an error "undefined reference to `sball_initialized'" on non-Windows operating systems. (cherry picked from commit 989ceddc191419daa02b08f664bbbce11cbc5598) (cherry picked from commit 989ceddc191419daa02b08f664bbbce11cbc5598) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1769 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/fg_spaceball.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/freeglut/freeglut/src/fg_spaceball.c b/freeglut/freeglut/src/fg_spaceball.c index 16b0c52..9534746 100644 --- a/freeglut/freeglut/src/fg_spaceball.c +++ b/freeglut/freeglut/src/fg_spaceball.c @@ -11,7 +11,7 @@ #include #include "fg_internal.h" -#if(_WIN32_WINNT >= 0x0501) +#if( !_WIN32 || _WIN32_WINNT >= 0x0501) /* -- PRIVATE FUNCTIONS --------------------------------------------------- */ From 866f61ae9ced95979283d62fc07ba13af7a60076 Mon Sep 17 00:00:00 2001 From: dcnieho Date: Sat, 11 Jul 2015 21:26:56 +0000 Subject: [PATCH 2/3] Create cmake package using imported targets. Create and install the necessary files so that cmake can find FreeGLUT in config mode ("find_package(FreeGLUT CONFIG)"). This pushes cmake_minimum_required to 3.0.0. (cherry picked from commit ba7326ce8db20dd52785ef1a08da06d8341fc4c1) (cherry picked from commit ba7326ce8db20dd52785ef1a08da06d8341fc4c1) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1770 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/CMakeLists.txt | 49 +++++++++++++++++++---- freeglut/freeglut/FreeGLUTConfig.cmake.in | 1 + 2 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 freeglut/freeglut/FreeGLUTConfig.cmake.in diff --git a/freeglut/freeglut/CMakeLists.txt b/freeglut/freeglut/CMakeLists.txt index 7d7d685..4be7c73 100644 --- a/freeglut/freeglut/CMakeLists.txt +++ b/freeglut/freeglut/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) +CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR) PROJECT(freeglut) # for multiarch LIBDIR support (requires cmake>=2.8.8) @@ -20,6 +20,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) set(VERSION_MAJOR 3) set(VERSION_MINOR 0) set(VERSION_PATCH 0) +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) @@ -454,30 +455,34 @@ IF(FREEGLUT_BUILD_STATIC_LIBS) ENDIF() IF(FREEGLUT_BUILD_SHARED_LIBS) - INSTALL(TARGETS freeglut + INSTALL(TARGETS freeglut EXPORT FreeGLUTTargets RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION include ) IF(INSTALL_PDB) INSTALL(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/freeglut${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION bin - CONFIGURATIONS Debug) + CONFIGURATIONS Debug + COMPONENT Devel) ENDIF() ENDIF() IF(FREEGLUT_BUILD_STATIC_LIBS) - INSTALL(TARGETS freeglut_static + INSTALL(TARGETS freeglut_static EXPORT FreeGLUTTargets RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + INCLUDES DESTINATION include ) IF(INSTALL_PDB) INSTALL(FILES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/Debug/freeglut_static${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION lib - CONFIGURATIONS Debug) + CONFIGURATIONS Debug + COMPONENT Devel) ENDIF() ENDIF() -INSTALL(FILES ${FREEGLUT_HEADERS} DESTINATION include/GL) +INSTALL(FILES ${FREEGLUT_HEADERS} DESTINATION include/GL COMPONENT Devel) @@ -571,6 +576,36 @@ IF(FREEGLUT_GLES) SET(PC_FILENAME "freeglut-gles.pc") 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}) +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, # e.g. -lglut-GLES + +INCLUDE(CMakePackageConfigHelpers) +WRITE_BASIC_PACKAGE_VERSION_FILE( + "${CMAKE_CURRENT_BINARY_DIR}/FreeGLUT/FreeGLUTConfigVersion.cmake" + VERSION ${VERSION} + COMPATIBILITY AnyNewerVersion +) + +# needs cmake 3.0 (as does the "INCLUDES DIRECTORY" argument to install(TARGETS)): +EXPORT(EXPORT FreeGLUTTargets + FILE "${CMAKE_CURRENT_BINARY_DIR}/FreeGLUT/FreeGLUTTargets.cmake" + NAMESPACE FreeGLUT:: +) +CONFIGURE_FILE(FreeGLUTConfig.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/FreeGLUT/FreeGLUTConfig.cmake" + @ONLY +) +SET(ConfigPackageLocation lib/cmake/FreeGLUT) +INSTALL(EXPORT FreeGLUTTargets + FILE FreeGLUTTargets.cmake + NAMESPACE FreeGLUT:: + DESTINATION ${ConfigPackageLocation} +) +INSTALL( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/FreeGLUT/FreeGLUTConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/FreeGLUT/FreeGLUTConfigVersion.cmake" + DESTINATION ${ConfigPackageLocation} + COMPONENT Devel +) diff --git a/freeglut/freeglut/FreeGLUTConfig.cmake.in b/freeglut/freeglut/FreeGLUTConfig.cmake.in new file mode 100644 index 0000000..ac36b6c --- /dev/null +++ b/freeglut/freeglut/FreeGLUTConfig.cmake.in @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/FreeGLUTTargets.cmake") From 98252934256b17be6335d8f13c3e35828df994b1 Mon Sep 17 00:00:00 2001 From: dcnieho Date: Sat, 11 Jul 2015 21:27:03 +0000 Subject: [PATCH 3/3] Set public definitions in cmake package. As with pkg-config, the cmake package now sets "-DFREEGLUT_GLES" when appropriate. (cherry picked from commit 792d805542a9a96053e1fb3e49f9518ee462d9b0) (cherry picked from commit 792d805542a9a96053e1fb3e49f9518ee462d9b0) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1771 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/freeglut/freeglut/CMakeLists.txt b/freeglut/freeglut/CMakeLists.txt index 4be7c73..be50f98 100644 --- a/freeglut/freeglut/CMakeLists.txt +++ b/freeglut/freeglut/CMakeLists.txt @@ -245,8 +245,8 @@ ENDIF() # but do use GLES constants directly for all other needs # GLES1 and GLES2 libraries are compatible and can be co-linked. IF(FREEGLUT_GLES) - ADD_DEFINITIONS(-DFREEGLUT_GLES) - LIST(APPEND LIBS GLESv2 GLESv1_CM EGL) + LIST(APPEND PUBLIC_DEFINITIONS -DFREEGLUT_GLES) + LIST(APPEND LIBS GLESv2 GLESv1_CM EGL) ELSE() FIND_PACKAGE(OpenGL REQUIRED) LIST(APPEND LIBS ${OPENGL_gl_LIBRARY}) @@ -449,9 +449,11 @@ ELSE() ENDIF() IF(FREEGLUT_BUILD_SHARED_LIBS) TARGET_LINK_LIBRARIES(freeglut ${LIBS}) + TARGET_COMPILE_DEFINITIONS(freeglut PUBLIC ${PUBLIC_DEFINITIONS}) ENDIF() IF(FREEGLUT_BUILD_STATIC_LIBS) TARGET_LINK_LIBRARIES(freeglut_static ${LIBS}) + TARGET_COMPILE_DEFINITIONS(freeglut_static PUBLIC ${PUBLIC_DEFINITIONS}) ENDIF() IF(FREEGLUT_BUILD_SHARED_LIBS)