mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-02 23:31:34 +01:00
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
From 91fd5586304edd0a0245d6aae154a6751279a416 Mon Sep 17 00:00:00 2001
|
|
From: Leon Marz <main@lmarz.org>
|
|
Date: Wed, 28 Sep 2022 16:01:51 +0200
|
|
Subject: [PATCH 1/2] cmake fixes
|
|
|
|
---
|
|
CMakeLists.txt | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a7da6b2..d78169f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -152,6 +152,7 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Intel")
|
|
endif()
|
|
|
|
|
|
+if (false)
|
|
if (NOT CMAKE_COMPILER_IS_ICC)
|
|
# Currently icc has a bug that asserts when linking rpaths containing long
|
|
# sequences of ':' that this command causes. The consequence is that examples
|
|
@@ -163,6 +164,7 @@ endif()
|
|
# add the automatically determined parts of the RPATH
|
|
# which point to directories outside the build tree to the install RPATH
|
|
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
|
+endif()
|
|
|
|
# ensure that ARC is shown as enabled in the Xcode UI
|
|
if(CMAKE_GENERATOR STREQUAL "Xcode")
|
|
@@ -504,6 +506,7 @@ elseif(OPENGL_FOUND)
|
|
set(OPENGL_LOADER_INCLUDE_DIRS
|
|
${PROJECT_SOURCE_DIR}/glLoader)
|
|
set(OPENGL_LOADER_LIBRARIES
|
|
+ OpenGL::GL
|
|
${CMAKE_DL_LIBS})
|
|
|
|
endif()
|
|
--
|
|
2.42.0
|
|
|