[ci] Build fixes

ossia · Apr 6, 2024 · a2eb575 · a2eb575
1 parent 14eb4d0
commit a2eb575
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,7 @@ cmake_minimum_required(VERSION 3.24 FATAL_ERROR)
 
 project(ossia C CXX)
 
+set(OSSIA_IS_TOP_LEVEL "${PROJECT_IS_TOP_LEVEL}")
 set(CMAKE_POSITION_INDEPENDENT_CODE 1)
 find_package(Threads)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -10,10 +10,9 @@ set(WINDOWS_EXPORT_ALL_SYMBOLS FALSE)
 cmake_policy(SET CMP0020 NEW)
 cmake_policy(SET CMP0042 NEW)
 cmake_policy(SET CMP0063 NEW)
-
 if(APPLE)
   set(CMAKE_INSTALL_NAME_DIR @rpath)
-  set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+  set(CMAKE_BUILD_WITH_INSTALL_RPATH "${OSSIA_IS_TOP_LEVEL}")
   set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks;@executable_path;")
 endif()
 

diff --git a/src/ossia/detail/jthread.hpp b/src/ossia/detail/jthread.hpp
@@ -5,7 +5,7 @@
 #if __cpp_lib_jthread >= 201911L
 #define OSSIA_HAS_STD_JTHREAD 1
 
-#elif _LIBCPP_VERSION >= 18100
+#elif (_LIBCPP_VERSION >= 18100) && (_LIBCPP_VERSION < 99999)
 #if defined(_LIBCPP_HAS_NO_EXPERIMENTAL_STOP_TOKEN)
 #error Rebuild with -fexperimental-library, clang 18 ships headers which are incompatible with this file but hides half of them behind that flag
 #else