Skip to content

Commit f77b882

Browse files
committed
Install fixes
1 parent 0d79e16 commit f77b882

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

.github/jobs/test_install_ios.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
displayName: "Select Xcode $(XCODE_VERSION)"
2121
2222
- script: |
23-
cmake -B build -G Xcode -D IOS=ON -D DEPLOYMENT_TARGET=${{parameters.deploymentTarget}} -D CMAKE_IOS_INSTALL_COMBINED=NO -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
23+
cmake -B build/iOS -G Xcode -D IOS=ON -D DEPLOYMENT_TARGET=${{parameters.deploymentTarget}} -D CMAKE_IOS_INSTALL_COMBINED=NO -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
2424
displayName: "Configure"
2525
2626
- script: |
27-
cmake --build build --config RelWithDebInfo -- -sdk iphoneos CODE_SIGNING_ALLOWED=NO
27+
cmake --build build/iOS --config RelWithDebInfo -- -sdk iphoneos CODE_SIGNING_ALLOWED=NO
2828
displayName: "Build"
2929
3030
- script: |
31-
cmake --install build --prefix=build/Install --config RelWithDebInfo
31+
cmake --install build/iOS --prefix=build/iOS/Install --config RelWithDebInfo
3232
displayName: "Install"

.github/jobs/test_install_linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
displayName: "Install packages"
2727
2828
- script: |
29-
cmake -B build -G Ninja -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
29+
cmake -B build/Linux -G Ninja -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
3030
displayName: "Configure"
3131
3232
- script: |
33-
cmake --build build --config RelWithDebInfo
33+
cmake --build build/Linux --config RelWithDebInfo
3434
displayName: "Build"
3535
3636
- script: |
37-
cmake --install build --prefix=build/Install --config=RelWithDebInfo
37+
cmake --install build/Linux --prefix=build/Linux/Install --config=RelWithDebInfo
3838
displayName: "Install"

.github/jobs/test_install_macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
displayName: "Select XCode $(XCODE_VERSION)"
2020
2121
- script: |
22-
cmake -B build -G Xcode -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
22+
cmake -B build/macOS -G Xcode -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
2323
displayName: "Configure"
2424
2525
- script: |
26-
cmake --build build --config RelWithDebInfo
26+
cmake --build build/macOS --config RelWithDebInfo
2727
displayName: "Build"
2828
2929
- script: |
30-
cmake --install build --prefix=build/Install --config RelWithDebInfo
30+
cmake --install build/macOS --prefix=build/macOS/Install --config RelWithDebInfo
3131
displayName: "Install"

.github/jobs/test_install_win32.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ jobs:
2020
vmImage: ${{parameters.vmImage}}
2121

2222
- script: |
23-
cmake -B build -G "Visual Studio 17 2022" -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
23+
cmake -B build/Win32 -G "Visual Studio 17 2022" -D CMAKE_UNITY_BUILD=$(UNITY_BUILD) -D BABYLON_NATIVE_BUILD_APPS=OFF -D BABYLON_DEBUG_TRACE=ON
2424
displayName: "Configure"
2525
2626
- script: |
27-
cmake --build build --config RelWithDebInfo
27+
cmake --build build/Win32 --config RelWithDebInfo
2828
displayName: "Build"
2929
3030
- script: |
31-
cmake --install build --prefix=build/Install --config RelWithDebInfo
31+
cmake --install build/Win32 --prefix=build/Win32/Install --config RelWithDebInfo
3232
displayName: "Install"
3333
3434
- script: |
35-
cmake Install/Test -B build/Install/Test -D INSTALL_DIR=$(Build.SourcesDirectory)/build/Win32/Install
36-
cmake --build build/Install/Test --config RelWithDebInfo
37-
displayName: "Install Test"
35+
cmake Install/Test -B build/TestInstall -D INSTALL_DIR=$(Build.SourcesDirectory)/build/Win32/Install
36+
cmake --build build/TestInstall --config RelWithDebInfo
37+
displayName: "Test Install"

0 commit comments

Comments
 (0)