build: Fix pkgconfig file and link to threads better.

Signed-off-by: Ryan Pavlik <[email protected]>
KhronosGroup · Dec 11, 2019 · a156535 · a156535
1 parent f24753d
commit a156535
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -39,6 +39,7 @@ elseif(BUILD_ALL_EXTENSIONS)
     message(FATAL_ERROR "Vulkan headers not found")
 endif()
 
+find_package(Threads REQUIRED)
 find_package(JsonCpp)
 
 ### All options defined here

diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt
@@ -131,11 +131,13 @@ if(NOT BUILD_LOADER_WITH_EXCEPTION_HANDLING)
         PRIVATE XRLOADER_DISABLE_EXCEPTION_HANDLING
     )
 endif()
-target_link_libraries(openxr_loader PRIVATE openxr-all-supported)
-
-target_compile_definitions(openxr_loader
-    PRIVATE API_NAME="OpenXR"
+target_link_libraries(
+    openxr_loader
+    PRIVATE openxr-all-supported ${CMAKE_DL_LIBS}
+    PUBLIC ${CMAKE_THREAD_LIBS_INIT}
 )
+
+target_compile_definitions(openxr_loader PRIVATE API_NAME="OpenXR")
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     target_compile_definitions(openxr_loader
         PRIVATE FALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}"
@@ -147,12 +149,17 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     endif()
 
     set_target_properties(openxr_loader PROPERTIES SOVERSION "${MAJOR}" VERSION "${MAJOR}.${MINOR}.${PATCH}")
-    target_link_libraries(openxr_loader PRIVATE stdc++fs dl PUBLIC pthread m)
+    target_link_libraries(
+        openxr_loader
+        PRIVATE stdc++fs
+        PUBLIC m
+    )
 
     add_custom_target(libopenxr_loader.so.${MAJOR}.${MINOR} ALL
         COMMAND ${CMAKE_COMMAND} -E create_symlink libopenxr_loader.so.${MAJOR}.${MINOR}.${PATCH} libopenxr_loader.so.${MAJOR}.${MINOR})
 
     set(XR_API_VERSION "${MAJOR}.${MINOR}")
+    set(EXTRA_LIBS ${CMAKE_THREAD_LIBS_INIT})
     configure_file("openxr.pc.in" "openxr.pc" @ONLY)
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/openxr.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 elseif(WIN32)

diff --git a/src/loader/openxr.pc.in b/src/loader/openxr.pc.in
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: @CMAKE_PROJECT_NAME@
 Description: OpenXR Loader
 Version: @XR_API_VERSION@
-Libs: -L${libdir} -lopenxr_loader @PRIVATE_LIBS@
+Libs: -L${libdir} -lopenxr_loader @EXTRA_LIBS@
 Cflags: -I${includedir}