Fixed use of precompiled headers on MacOS, allowing to re-enable them…

… on CI.
DragonJoker · Sep 27, 2021 · d75d242 · d75d242
1 parent 62e0ff5
commit d75d242
Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -95,7 +95,7 @@ jobs:
       if: runner.os == 'macOS'
       shell: bash
       working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.buildType }} -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/package/ashes -DPROJECTS_USE_PRECOMPILED_HEADERS=OFF -DPROJECTS_WARNINGS_AS_ERRORS=$PROJ_WAE -DASHES_BUILD_TEMPLATES=OFF -DASHES_BUILD_TESTS=OFF -DASHES_BUILD_INFO=OFF -DASHES_BUILD_SAMPLES=OFF -DASHES_BUILD_RENDERER_OGL=ON -DASHES_BUILD_RENDERER_TEST=ON
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.buildType }} -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/package/ashes -DPROJECTS_WARNINGS_AS_ERRORS=$PROJ_WAE -DASHES_BUILD_TEMPLATES=OFF -DASHES_BUILD_TESTS=OFF -DASHES_BUILD_INFO=OFF -DASHES_BUILD_SAMPLES=OFF -DASHES_BUILD_RENDERER_OGL=ON -DASHES_BUILD_RENDERER_TEST=ON
 
     - name: Build
       working-directory: ${{runner.workspace}}/build-${{ matrix.buildType }}

diff --git a/samples/00-Common/CMakeLists.txt b/samples/00-Common/CMakeLists.txt
@@ -57,6 +57,7 @@ if ( APPLE )
 		${HEADER_FILES}
 		Src/MetalLayer.h
 	)
+	set( PROJECTS_USE_PRECOMPILED_HEADERS OFF )
 endif ()
 
 source_group( "Shader Files" FILES ${GLSL_SHADER_FILES} )

diff --git a/source/ashes/renderer/GlRenderer/CMakeLists.txt b/source/ashes/renderer/GlRenderer/CMakeLists.txt
@@ -31,6 +31,7 @@ if ( OpenGL_FOUND )
 			"-framework AppKit"
 			OpenGL::GL
 		)
+		set( PROJECTS_USE_PRECOMPILED_HEADERS OFF )
 	else ()
 		find_package( X11 )
 		if ( ASHES_USE_XLIB_EGL )

diff --git a/test/00-Common/CMakeLists.txt b/test/00-Common/CMakeLists.txt
@@ -31,6 +31,7 @@ if ( APPLE )
 		${HEADER_FILES}
 		Src/MetalLayer.h
 	)
+	set( PROJECTS_USE_PRECOMPILED_HEADERS OFF )
 endif ()
 
 add_library( ${PROJECT_NAME} STATIC