mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-25 22:50:25 -05:00
macOS: Initial Apple Silicon and x86_64 build support
* Refactor: add MACOSX_BUNDLE option to qt_add_executable in multiple CMakeLists.txt files * #14045 macOS: Guard std::stacktrace usage and skip ucontext on Apple platforms * #14045 macOS: Guard std::ispanstream with std::istringstream fallback * #14045 macOS: Add vcpkg overlay triplets for osx and exclude grpc on osx * #14045 macOS: CMake macOS build support and openzgy OpenMP-disable patch * #14045 CI: Add macOS build workflow * #14045 macOS: Use feature-test macros to detect <stacktrace> and <spanstream> * #14045 macOS: Make MAX_STIMPLAN_LAYERS constexpr to fix arm64 link error * #14045 CI: Ship README-macOS.txt with artifact to document Gatekeeper workaround * #14045 CI: Pin macOS runner to macos-14 and set deployment target to 14.0 * #14045 CI: Move macOS runner to macos-15 and fix README step on configure failure
This commit is contained in:
1 parent
187addb1d0
commit
022d77bef8
19 files changed
+627
-14
No files matched your search
@@ -26,7 +26,7 @@ set(PROJECT_FILES
|
||||
cafMockObjects.cpp
|
||||
)
|
||||
|
||||
qt_add_executable(${PROJECT_NAME} ${PROJECT_FILES})
|
||||
qt_add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${PROJECT_FILES})
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
target_compile_options(
|
||||
|
||||
@@ -37,7 +37,7 @@ set(PROJECT_FILES
|
||||
TestObj.h
|
||||
)
|
||||
|
||||
qt_add_executable(${PROJECT_NAME} ${PROJECT_FILES})
|
||||
qt_add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${PROJECT_FILES})
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ set(PROJECT_FILES
|
||||
cafPdmPtrArrayTest.cpp
|
||||
)
|
||||
|
||||
qt_add_executable(${PROJECT_NAME} ${PROJECT_FILES})
|
||||
qt_add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${PROJECT_FILES})
|
||||
|
||||
target_link_libraries(
|
||||
${PROJECT_NAME} PRIVATE cafPdmXml ${QT_LIBRARIES} ${THREAD_LIBRARY}
|
||||
|
||||
@@ -29,7 +29,7 @@ set(PROJECT_FILES
|
||||
gtest/gtest-all.cpp
|
||||
)
|
||||
|
||||
qt_add_executable(${PROJECT_NAME} ${PROJECT_FILES})
|
||||
qt_add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${PROJECT_FILES})
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
target_compile_options(
|
||||
|
||||
@@ -67,7 +67,11 @@ set(PROJECT_FILES
|
||||
)
|
||||
|
||||
qt_add_executable(
|
||||
${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES} ${QRC_FILES}
|
||||
${PROJECT_NAME}
|
||||
MACOSX_BUNDLE
|
||||
${PROJECT_FILES}
|
||||
${MOC_SOURCE_FILES}
|
||||
${QRC_FILES}
|
||||
$<TARGET_OBJECTS:cafCommandFeatures> # Needed for cmake version < 3.12. Remove
|
||||
# when we can use target_link_libraries with OBJECT libraries
|
||||
)
|
||||
|
||||
@@ -23,7 +23,7 @@ set(PROJECT_FILES
|
||||
gtest/gtest-all.cpp
|
||||
)
|
||||
|
||||
qt_add_executable(${PROJECT_NAME} ${PROJECT_FILES})
|
||||
qt_add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${PROJECT_FILES})
|
||||
|
||||
target_link_libraries(
|
||||
${PROJECT_NAME} PRIVATE cafUserInterface ${QT_LIBRARIES} ${THREAD_LIBRARY}
|
||||
|
||||
Reference in new issue
Block a user