Skip to content

Commit f8feaf8

Browse files
committed
Updated CPU count used for CI based on latest instance sizes.
Increased default macOS deployment target to 10.15 to account for usage of std::filesystem.
1 parent e3c2b50 commit f8feaf8

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ env:
1313
cmake_common_args: >-
1414
-DCMAKE_FIND_ROOT_PATH=${{ github.workspace }}/dependencies
1515
-DCMAKE_PREFIX_PATH=${{ github.workspace }}/dependencies
16-
cores_count: '2'
16+
cores_count: '4'
1717
cores_mac_count: '3'
1818
dependency_location: "${{ github.workspace }}/dependencies"
1919
gtest_version: release-1.12.1

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if (NOT MSL_BUILD_COMPILE AND NOT MSL_BUILD_CLIENT)
3333
endif()
3434

3535
if (APPLE AND NOT IOS AND NOT CMAKE_OSX_DEPLOYMENT_TARGET)
36-
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11 CACHE STRING "Minimum macOS deployment version." FORCE)
36+
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Minimum macOS deployment version." FORCE)
3737
endif()
3838

3939
if (MSL_BUILD_TESTS)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ The following options may be used when running cmake:
103103
* `-DMSL_ROOT_FOLDER=folder`: The root folder for the projects in IDEs that support them. (e.g. Visual Studio or XCode) This is useful if embedding MSL in another project. Defaults to MSL.
104104
* `-DMSL_INSTALL=ON|OFF`: Allow installation for MSL components. This can be useful when embedding in other projects to prevent installations from including MSL. For example, when statically linking into a shared library. Default is `ON`.
105105
* `-DMSL_INSTALL_SET_RPATH=ON|OFF`: Set rpath during install for the library and tool on installation. Set to `OFF` if including in another project that wants to control the rpath. Default is `ON`.
106-
* `-DCMAKE_OSX_DEPLOYMENT_TARGET=version`: Minimum version of macOS to target when building for Mac. Defaults to 10.11.
106+
* `-DCMAKE_OSX_DEPLOYMENT_TARGET=version`: Minimum version of macOS to target when building for Mac. Defaults to 10.15.
107107

108108
Once you have built and installed MSL, you can find the various modules with the `find_package()` CMake function. For example:
109109

0 commit comments

Comments
 (0)