Skip to content

Commit d298766

Browse files
install with libraries prefix
1 parent f6a23a7 commit d298766

6 files changed

Lines changed: 7 additions & 13 deletions

File tree

.github/workflows/job-cmakebuild-linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ jobs:
4747
if-no-files-found: error
4848
path: |
4949
Result.Linux.x64.${{inputs.configuration}}/bin
50+
Result.Linux.x64.${{inputs.configuration}}/lib
5051
Result.Linux.x64.${{inputs.configuration}}/ZEngine/tests

.github/workflows/job-cmakebuild-macOS.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@ jobs:
3434
if-no-files-found: error
3535
path: |
3636
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/bin/
37+
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/lib/
3738
Result.Darwin.${{inputs.architecture}}.${{inputs.configuration}}/ZEngine/tests/${{inputs.configuration}}/

.github/workflows/job-cmakebuild-windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@ jobs:
3434
if-no-files-found: error
3535
path: |
3636
Result.Windows.x64.MultiConfig/bin/
37+
Result.Windows.x64.MultiConfig/lib/
3738
Result.Windows.x64.MultiConfig/ZEngine/tests/${{inputs.configuration}}/

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
3434
add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING) # Fix Warning from VS 2022 +
3535
endif()
3636

37+
list( APPEND CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib )
38+
3739
# Externals dependencies
3840
#
3941
if (NOT LAUNCHER_ONLY)
4042

4143
## Setup Dependencies
42-
4344
include(dependencies.cmake)
4445

4546
# Core engine lib is here

CMakePresets.json

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"binaryDir": "Result.Windows.x64.MultiConfig",
6666
"architecture": "x64",
6767
"cacheVariables": {
68-
"CMAKE_INSTALL_PREFIX": "Result.Windows.x64.MultiConfig",
6968
"CMAKE_CONFIGURATION_TYPES": "Debug"
7069
}
7170

@@ -87,7 +86,6 @@
8786
"generator": "Xcode",
8887
"cacheVariables": {
8988
"BUILD_FRAMEWORK": "ON",
90-
"CMAKE_INSTALL_PREFIX": "Result.Darwin.x64.Debug",
9189
"CMAKE_CONFIGURATION_TYPES": "Debug"
9290
}
9391
},
@@ -98,7 +96,6 @@
9896
"binaryDir": "Result.Darwin.x64.Release",
9997
"cacheVariables": {
10098
"CMAKE_BUILD_TYPE": "Release",
101-
"CMAKE_INSTALL_PREFIX": "Result.Darwin.x64.Release",
10299
"CMAKE_CONFIGURATION_TYPES": "Release"
103100
}
104101
},
@@ -107,20 +104,14 @@
107104
"name": "Darwin_arm64_Debug",
108105
"inherits": "Darwin_x64_Debug",
109106
"binaryDir": "Result.Darwin.arm64.Debug",
110-
"displayName": "Darwin ARM XCode Debug",
111-
"cacheVariables": {
112-
"CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Debug"
113-
}
107+
"displayName": "Darwin ARM XCode Debug"
114108
},
115109

116110
{
117111
"name": "Darwin_arm64_Release",
118112
"inherits": "Darwin_x64_Release",
119113
"binaryDir": "Result.Darwin.arm64.Release",
120-
"displayName": "Darwin ARM XCode Release",
121-
"cacheVariables": {
122-
"CMAKE_INSTALL_PREFIX": "Result.Darwin.arm64.Release"
123-
}
114+
"displayName": "Darwin ARM XCode Release"
124115
},
125116

126117
{

Obelisk/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ set (CMAKE_CXX_STANDARD_REQUIRED ON)
1010
set (CMAKE_CXX_STANDARD 20)
1111

1212

13-
list( APPEND CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib )
1413

1514

1615
set (TARGET_NAME Obelisk)

0 commit comments

Comments
 (0)