From ab05ace3ce8b999ab665194e63b8b5d03a7787ac Mon Sep 17 00:00:00 2001 From: ratalaika Date: Sat, 22 Nov 2014 00:13:09 +0100 Subject: Added first version of OS X compilation support --- external/glfw3/lib/cmake/glfw/glfwConfig.cmake | 10 +++ .../glfw3/lib/cmake/glfw/glfwConfigVersion.cmake | 12 +++ .../glfw3/lib/cmake/glfw/glfwTargets-debug.cmake | 20 +++++ external/glfw3/lib/cmake/glfw/glfwTargets.cmake | 84 +++++++++++++++++++++ external/glfw3/lib/libglfw.3.0.dylib | Bin 0 -> 127856 bytes external/glfw3/lib/libglfw.3.dylib | 1 + external/glfw3/lib/libglfw.dylib | 1 + external/glfw3/lib/pkgconfig/glfw3.pc | 13 ++++ 8 files changed, 141 insertions(+) create mode 100644 external/glfw3/lib/cmake/glfw/glfwConfig.cmake create mode 100644 external/glfw3/lib/cmake/glfw/glfwConfigVersion.cmake create mode 100644 external/glfw3/lib/cmake/glfw/glfwTargets-debug.cmake create mode 100644 external/glfw3/lib/cmake/glfw/glfwTargets.cmake create mode 100755 external/glfw3/lib/libglfw.3.0.dylib create mode 120000 external/glfw3/lib/libglfw.3.dylib create mode 120000 external/glfw3/lib/libglfw.dylib create mode 100644 external/glfw3/lib/pkgconfig/glfw3.pc (limited to 'external') diff --git a/external/glfw3/lib/cmake/glfw/glfwConfig.cmake b/external/glfw3/lib/cmake/glfw/glfwConfig.cmake new file mode 100644 index 00000000..b11654d3 --- /dev/null +++ b/external/glfw3/lib/cmake/glfw/glfwConfig.cmake @@ -0,0 +1,10 @@ +# - Config file for the glfw package +# It defines the following variables +# GLFW_INCLUDE_DIR, the path where GLFW headers are located +# GLFW_LIBRARY_DIR, folder in which the GLFW library is located +# GLFW_LIBRARY, library to link against to use GLFW + +set(GLFW_INCLUDE_DIR "/Users/ratalaika/Repositories/external/glfw3/lib/include") +set(GLFW_LIBRARY_DIR "/Users/ratalaika/Repositories/external/glfw3/lib/lib") + +find_library(GLFW_LIBRARY "glfw" HINTS ${GLFW_LIBRARY_DIR}) diff --git a/external/glfw3/lib/cmake/glfw/glfwConfigVersion.cmake b/external/glfw3/lib/cmake/glfw/glfwConfigVersion.cmake new file mode 100644 index 00000000..524c86dc --- /dev/null +++ b/external/glfw3/lib/cmake/glfw/glfwConfigVersion.cmake @@ -0,0 +1,12 @@ + +set(PACKAGE_VERSION "3.0.4") + +if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "3") + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 0) + set(PACKAGE_VERSION_EXACT TRUE) + endif() +else() + set(PACKAGE_VERSION_COMPATIBLE FALSE) +endif() + diff --git a/external/glfw3/lib/cmake/glfw/glfwTargets-debug.cmake b/external/glfw3/lib/cmake/glfw/glfwTargets-debug.cmake new file mode 100644 index 00000000..f35f7d2f --- /dev/null +++ b/external/glfw3/lib/cmake/glfw/glfwTargets-debug.cmake @@ -0,0 +1,20 @@ +#---------------------------------------------------------------- +# Generated CMake target import file for configuration "Debug". +#---------------------------------------------------------------- + +# Commands may need to know the format version. +set(CMAKE_IMPORT_FILE_VERSION 1) + +# Import target "glfw" for configuration "Debug" +set_property(TARGET glfw APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) +set_target_properties(glfw PROPERTIES + IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG "" + IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/libglfw.3.0.dylib" + IMPORTED_SONAME_DEBUG "/Users/ratalaika/Repositories/external/glfw3/lib/lib/libglfw.3.dylib" + ) + +list(APPEND _IMPORT_CHECK_TARGETS glfw ) +list(APPEND _IMPORT_CHECK_FILES_FOR_glfw "${_IMPORT_PREFIX}/lib/libglfw.3.0.dylib" ) + +# Commands beyond this point should not need to know the version. +set(CMAKE_IMPORT_FILE_VERSION) diff --git a/external/glfw3/lib/cmake/glfw/glfwTargets.cmake b/external/glfw3/lib/cmake/glfw/glfwTargets.cmake new file mode 100644 index 00000000..bd183427 --- /dev/null +++ b/external/glfw3/lib/cmake/glfw/glfwTargets.cmake @@ -0,0 +1,84 @@ +# Generated by CMake 3.1.0-rc2 + +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) + message(FATAL_ERROR "CMake >= 2.6.0 required") +endif() +cmake_policy(PUSH) +cmake_policy(VERSION 2.6) +#---------------------------------------------------------------- +# Generated CMake target import file. +#---------------------------------------------------------------- + +# Commands may need to know the format version. +set(CMAKE_IMPORT_FILE_VERSION 1) + +# Protect against multiple inclusion, which would fail when already imported targets are added once more. +set(_targetsDefined) +set(_targetsNotDefined) +set(_expectedTargets) +foreach(_expectedTarget glfw) + list(APPEND _expectedTargets ${_expectedTarget}) + if(NOT TARGET ${_expectedTarget}) + list(APPEND _targetsNotDefined ${_expectedTarget}) + endif() + if(TARGET ${_expectedTarget}) + list(APPEND _targetsDefined ${_expectedTarget}) + endif() +endforeach() +if("${_targetsDefined}" STREQUAL "${_expectedTargets}") + set(CMAKE_IMPORT_FILE_VERSION) + cmake_policy(POP) + return() +endif() +if(NOT "${_targetsDefined}" STREQUAL "") + message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n") +endif() +unset(_targetsDefined) +unset(_targetsNotDefined) +unset(_expectedTargets) + + +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +# Create imported target glfw +add_library(glfw SHARED IMPORTED) + +# Load information for each installed configuration. +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +file(GLOB CONFIG_FILES "${_DIR}/glfwTargets-*.cmake") +foreach(f ${CONFIG_FILES}) + include(${f}) +endforeach() + +# Cleanup temporary variables. +set(_IMPORT_PREFIX) + +# Loop over all imported files and verify that they actually exist +foreach(target ${_IMPORT_CHECK_TARGETS} ) + foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) + if(NOT EXISTS "${file}" ) + message(FATAL_ERROR "The imported target \"${target}\" references the file + \"${file}\" +but this file does not exist. Possible reasons include: +* The file was deleted, renamed, or moved to another location. +* An install or uninstall procedure did not complete successfully. +* The installation package was faulty and contained + \"${CMAKE_CURRENT_LIST_FILE}\" +but not all the files it references. +") + endif() + endforeach() + unset(_IMPORT_CHECK_FILES_FOR_${target}) +endforeach() +unset(_IMPORT_CHECK_TARGETS) + +# This file does not depend on other imported targets which have +# been exported from the same project but in a separate export set. + +# Commands beyond this point should not need to know the version. +set(CMAKE_IMPORT_FILE_VERSION) +cmake_policy(POP) diff --git a/external/glfw3/lib/libglfw.3.0.dylib b/external/glfw3/lib/libglfw.3.0.dylib new file mode 100755 index 00000000..963d716d Binary files /dev/null and b/external/glfw3/lib/libglfw.3.0.dylib differ diff --git a/external/glfw3/lib/libglfw.3.dylib b/external/glfw3/lib/libglfw.3.dylib new file mode 120000 index 00000000..cd20112e --- /dev/null +++ b/external/glfw3/lib/libglfw.3.dylib @@ -0,0 +1 @@ +libglfw.3.0.dylib \ No newline at end of file diff --git a/external/glfw3/lib/libglfw.dylib b/external/glfw3/lib/libglfw.dylib new file mode 120000 index 00000000..d4bd51e1 --- /dev/null +++ b/external/glfw3/lib/libglfw.dylib @@ -0,0 +1 @@ +libglfw.3.dylib \ No newline at end of file diff --git a/external/glfw3/lib/pkgconfig/glfw3.pc b/external/glfw3/lib/pkgconfig/glfw3.pc new file mode 100644 index 00000000..f5252b35 --- /dev/null +++ b/external/glfw3/lib/pkgconfig/glfw3.pc @@ -0,0 +1,13 @@ +prefix=/Users/ratalaika/Repositories/external/glfw3/lib +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib + +Name: GLFW +Description: A portable library for OpenGL, window and input +Version: 3.0.4 +URL: http://www.glfw.org/ +Requires.private: +Libs: -L${libdir} -lglfw +Libs.private: -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework CoreVideo +Cflags: -I${includedir} -- cgit v1.2.3 From 2706fa86cdb327c2dc4a67729eb263cb486eb18a Mon Sep 17 00:00:00 2001 From: ratalaika Date: Sat, 22 Nov 2014 00:23:25 +0100 Subject: Cleaned GLFW library for OS X --- external/glfw3/lib/cmake/glfw/glfwConfig.cmake | 10 --- .../glfw3/lib/cmake/glfw/glfwConfigVersion.cmake | 12 ---- .../glfw3/lib/cmake/glfw/glfwTargets-debug.cmake | 20 ------ external/glfw3/lib/cmake/glfw/glfwTargets.cmake | 84 ---------------------- external/glfw3/lib/pkgconfig/glfw3.pc | 13 ---- 5 files changed, 139 deletions(-) delete mode 100644 external/glfw3/lib/cmake/glfw/glfwConfig.cmake delete mode 100644 external/glfw3/lib/cmake/glfw/glfwConfigVersion.cmake delete mode 100644 external/glfw3/lib/cmake/glfw/glfwTargets-debug.cmake delete mode 100644 external/glfw3/lib/cmake/glfw/glfwTargets.cmake delete mode 100644 external/glfw3/lib/pkgconfig/glfw3.pc (limited to 'external') diff --git a/external/glfw3/lib/cmake/glfw/glfwConfig.cmake b/external/glfw3/lib/cmake/glfw/glfwConfig.cmake deleted file mode 100644 index b11654d3..00000000 --- a/external/glfw3/lib/cmake/glfw/glfwConfig.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# - Config file for the glfw package -# It defines the following variables -# GLFW_INCLUDE_DIR, the path where GLFW headers are located -# GLFW_LIBRARY_DIR, folder in which the GLFW library is located -# GLFW_LIBRARY, library to link against to use GLFW - -set(GLFW_INCLUDE_DIR "/Users/ratalaika/Repositories/external/glfw3/lib/include") -set(GLFW_LIBRARY_DIR "/Users/ratalaika/Repositories/external/glfw3/lib/lib") - -find_library(GLFW_LIBRARY "glfw" HINTS ${GLFW_LIBRARY_DIR}) diff --git a/external/glfw3/lib/cmake/glfw/glfwConfigVersion.cmake b/external/glfw3/lib/cmake/glfw/glfwConfigVersion.cmake deleted file mode 100644 index 524c86dc..00000000 --- a/external/glfw3/lib/cmake/glfw/glfwConfigVersion.cmake +++ /dev/null @@ -1,12 +0,0 @@ - -set(PACKAGE_VERSION "3.0.4") - -if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "3") - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 0) - set(PACKAGE_VERSION_EXACT TRUE) - endif() -else() - set(PACKAGE_VERSION_COMPATIBLE FALSE) -endif() - diff --git a/external/glfw3/lib/cmake/glfw/glfwTargets-debug.cmake b/external/glfw3/lib/cmake/glfw/glfwTargets-debug.cmake deleted file mode 100644 index f35f7d2f..00000000 --- a/external/glfw3/lib/cmake/glfw/glfwTargets-debug.cmake +++ /dev/null @@ -1,20 +0,0 @@ -#---------------------------------------------------------------- -# Generated CMake target import file for configuration "Debug". -#---------------------------------------------------------------- - -# Commands may need to know the format version. -set(CMAKE_IMPORT_FILE_VERSION 1) - -# Import target "glfw" for configuration "Debug" -set_property(TARGET glfw APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) -set_target_properties(glfw PROPERTIES - IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG "" - IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/libglfw.3.0.dylib" - IMPORTED_SONAME_DEBUG "/Users/ratalaika/Repositories/external/glfw3/lib/lib/libglfw.3.dylib" - ) - -list(APPEND _IMPORT_CHECK_TARGETS glfw ) -list(APPEND _IMPORT_CHECK_FILES_FOR_glfw "${_IMPORT_PREFIX}/lib/libglfw.3.0.dylib" ) - -# Commands beyond this point should not need to know the version. -set(CMAKE_IMPORT_FILE_VERSION) diff --git a/external/glfw3/lib/cmake/glfw/glfwTargets.cmake b/external/glfw3/lib/cmake/glfw/glfwTargets.cmake deleted file mode 100644 index bd183427..00000000 --- a/external/glfw3/lib/cmake/glfw/glfwTargets.cmake +++ /dev/null @@ -1,84 +0,0 @@ -# Generated by CMake 3.1.0-rc2 - -if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) - message(FATAL_ERROR "CMake >= 2.6.0 required") -endif() -cmake_policy(PUSH) -cmake_policy(VERSION 2.6) -#---------------------------------------------------------------- -# Generated CMake target import file. -#---------------------------------------------------------------- - -# Commands may need to know the format version. -set(CMAKE_IMPORT_FILE_VERSION 1) - -# Protect against multiple inclusion, which would fail when already imported targets are added once more. -set(_targetsDefined) -set(_targetsNotDefined) -set(_expectedTargets) -foreach(_expectedTarget glfw) - list(APPEND _expectedTargets ${_expectedTarget}) - if(NOT TARGET ${_expectedTarget}) - list(APPEND _targetsNotDefined ${_expectedTarget}) - endif() - if(TARGET ${_expectedTarget}) - list(APPEND _targetsDefined ${_expectedTarget}) - endif() -endforeach() -if("${_targetsDefined}" STREQUAL "${_expectedTargets}") - set(CMAKE_IMPORT_FILE_VERSION) - cmake_policy(POP) - return() -endif() -if(NOT "${_targetsDefined}" STREQUAL "") - message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n") -endif() -unset(_targetsDefined) -unset(_targetsNotDefined) -unset(_expectedTargets) - - -# Compute the installation prefix relative to this file. -get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) - -# Create imported target glfw -add_library(glfw SHARED IMPORTED) - -# Load information for each installed configuration. -get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -file(GLOB CONFIG_FILES "${_DIR}/glfwTargets-*.cmake") -foreach(f ${CONFIG_FILES}) - include(${f}) -endforeach() - -# Cleanup temporary variables. -set(_IMPORT_PREFIX) - -# Loop over all imported files and verify that they actually exist -foreach(target ${_IMPORT_CHECK_TARGETS} ) - foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) - if(NOT EXISTS "${file}" ) - message(FATAL_ERROR "The imported target \"${target}\" references the file - \"${file}\" -but this file does not exist. Possible reasons include: -* The file was deleted, renamed, or moved to another location. -* An install or uninstall procedure did not complete successfully. -* The installation package was faulty and contained - \"${CMAKE_CURRENT_LIST_FILE}\" -but not all the files it references. -") - endif() - endforeach() - unset(_IMPORT_CHECK_FILES_FOR_${target}) -endforeach() -unset(_IMPORT_CHECK_TARGETS) - -# This file does not depend on other imported targets which have -# been exported from the same project but in a separate export set. - -# Commands beyond this point should not need to know the version. -set(CMAKE_IMPORT_FILE_VERSION) -cmake_policy(POP) diff --git a/external/glfw3/lib/pkgconfig/glfw3.pc b/external/glfw3/lib/pkgconfig/glfw3.pc deleted file mode 100644 index f5252b35..00000000 --- a/external/glfw3/lib/pkgconfig/glfw3.pc +++ /dev/null @@ -1,13 +0,0 @@ -prefix=/Users/ratalaika/Repositories/external/glfw3/lib -exec_prefix=${prefix} -includedir=${prefix}/include -libdir=${exec_prefix}/lib - -Name: GLFW -Description: A portable library for OpenGL, window and input -Version: 3.0.4 -URL: http://www.glfw.org/ -Requires.private: -Libs: -L${libdir} -lglfw -Libs.private: -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework CoreVideo -Cflags: -I${includedir} -- cgit v1.2.3