mirror of
https://github.com/glfw/glfw.git
synced 2024-11-22 13:04:35 +00:00
Fix pkg-config file generation regression
Fixes regression cased by 37c93ba031
.
Fixes #664.
Closes #679.
This commit is contained in:
parent
06899bd9a6
commit
d2d57c70e2
@ -50,6 +50,13 @@ if (BUILD_SHARED_LIBS)
|
|||||||
set(_GLFW_BUILD_DLL 1)
|
set(_GLFW_BUILD_DLL 1)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (BUILD_SHARED_LIBS AND UNIX)
|
||||||
|
# On Unix-like systems, shared libraries can use the soname system.
|
||||||
|
set(GLFW_LIB_NAME glfw)
|
||||||
|
else()
|
||||||
|
set(GLFW_LIB_NAME glfw3)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (GLFW_USE_WAYLAND)
|
if (GLFW_USE_WAYLAND)
|
||||||
set(GLFW_USE_EGL ON)
|
set(GLFW_USE_EGL ON)
|
||||||
elseif (GLFW_USE_MIR)
|
elseif (GLFW_USE_MIR)
|
||||||
|
@ -52,6 +52,7 @@ endif()
|
|||||||
|
|
||||||
add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS})
|
add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS})
|
||||||
set_target_properties(glfw PROPERTIES
|
set_target_properties(glfw PROPERTIES
|
||||||
|
OUTPUT_NAME ${GLFW_LIB_NAME}
|
||||||
VERSION ${GLFW_VERSION}
|
VERSION ${GLFW_VERSION}
|
||||||
SOVERSION ${GLFW_VERSION_MAJOR}
|
SOVERSION ${GLFW_VERSION_MAJOR}
|
||||||
POSITION_INDEPENDENT_CODE ON
|
POSITION_INDEPENDENT_CODE ON
|
||||||
@ -105,13 +106,6 @@ if (MSVC)
|
|||||||
target_compile_definitions(glfw PRIVATE _CRT_SECURE_NO_WARNINGS)
|
target_compile_definitions(glfw PRIVATE _CRT_SECURE_NO_WARNINGS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (BUILD_SHARED_LIBS AND UNIX)
|
|
||||||
# On Unix-like systems, shared libraries can use the soname system.
|
|
||||||
set_target_properties(glfw PROPERTIES OUTPUT_NAME glfw)
|
|
||||||
else()
|
|
||||||
set_target_properties(glfw PROPERTIES OUTPUT_NAME glfw3)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (GLFW_INSTALL)
|
if (GLFW_INSTALL)
|
||||||
install(TARGETS glfw EXPORT glfwTargets DESTINATION lib${LIB_SUFFIX})
|
install(TARGETS glfw EXPORT glfwTargets DESTINATION lib${LIB_SUFFIX})
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user