mirror of
https://github.com/CPunch/Laika.git
synced 2024-11-21 20:40:05 +00:00
Removed MacOS target
This commit is contained in:
parent
35e85252ee
commit
33219ee9d6
16
.github/workflows/check-build.yaml
vendored
16
.github/workflows/check-build.yaml
vendored
@ -46,19 +46,3 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
name: laika-demo-binaries-windows
|
name: laika-demo-binaries-windows
|
||||||
path: bin
|
path: bin
|
||||||
|
|
||||||
macOS-build:
|
|
||||||
runs-on: macos-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
with:
|
|
||||||
submodules: recursive
|
|
||||||
- name: Create CMake build files
|
|
||||||
run: cmake -B build
|
|
||||||
- name: Check compilation
|
|
||||||
run: cmake --build build
|
|
||||||
- name: Upload build artifact
|
|
||||||
uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: laika-demo-binaries-macos
|
|
||||||
path: bin
|
|
@ -5,7 +5,7 @@ set(CMAKE_C_STANDARD 11)
|
|||||||
set(CMAKE_C_STANDARD_REQUIRED ON)
|
set(CMAKE_C_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
# Set the project as the default startup project for VS
|
# Set the project as the default startup project for VS
|
||||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Laika)
|
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT LaikaLib)
|
||||||
|
|
||||||
# include our cmake modules
|
# include our cmake modules
|
||||||
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake-modules" ${CMAKE_MODULE_PATH})
|
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake-modules" ${CMAKE_MODULE_PATH})
|
||||||
@ -42,10 +42,8 @@ add_subdirectory(lib)
|
|||||||
add_subdirectory(tools)
|
add_subdirectory(tools)
|
||||||
|
|
||||||
# these subprojects don't support windows (sorry)
|
# these subprojects don't support windows (sorry)
|
||||||
if(NOT WIN32)
|
if(NOT WIN32 AND (UNIX AND NOT APPLE))
|
||||||
|
add_subdirectory(bot) # windows support Soon:tm:
|
||||||
add_subdirectory(cnc)
|
add_subdirectory(cnc)
|
||||||
add_subdirectory(shell)
|
add_subdirectory(shell)
|
||||||
if(NOT APPLE)
|
|
||||||
add_subdirectory(bot) # windows support Soon:tm:
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user