Merge pull request #121 from bkaradzic/ci-fix-2

Add IOKit for Metal backend

.github/workflows/release.yml

@@ -75,11 +75,10 @@ jobs:
       # Run CMake to generate project files
       - name: Generate project files
         run: |
-          cmake -B "${{ env.CMAKE_BUILD_DIR }}" -DCMAKE_INSTALL_PREFIX="${{ env.CMAKE_INSTALL_DIR }}" -DCMAKE_DEBUG_POSTFIX=d -DBGFX_BUILD_EXAMPLES=OFF -DBGFX_BUILD_TOOLS=ON -DBGFX_INSTALL=ON -DBGFX_AMALGAMATED=ON
+          cmake -B "${{ env.CMAKE_BUILD_DIR }}" -DCMAKE_INSTALL_PREFIX="${{ env.CMAKE_INSTALL_DIR }}" -DCMAKE_DEBUG_POSTFIX=d -DBGFX_BUILD_EXAMPLES=OFF -DBGFX_BUILD_TOOLS=ON -DBGFX_INSTALL=ON -DBGFX_AMALGAMATED=ON -DCMAKE_BUILD_TYPE=Release
       # Build the install targets
       - name: Build
         run: |
-          cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target install --config Debug
           cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target install --config Release
       - uses: actions/upload-artifact@v2
         with:

.gitignore

@@ -13,3 +13,4 @@ install_manifest.txt
 generated/*
 !generated/*.in
 cmake_install.cmake
+.cache/

CMakeLists.txt

@@ -28,7 +28,6 @@ option( BGFX_INSTALL_EXAMPLES "Install examples and their runtimes."          OF
 option( BGFX_CUSTOM_TARGETS   "Include convenience custom targets."           ON  )
 option( BGFX_AMALGAMATED      "Amalgamated bgfx build for faster compilation" OFF )
 option( BX_AMALGAMATED        "Amalgamated bx build for faster compilation"   OFF )
-option( BGFX_CONFIG_DEBUG     "Enables debug configuration on all builds"     OFF )
 option( BGFX_CONFIG_RENDERER_WEBGPU     "Enables the webgpu renderer"         OFF )
 
 set( BGFX_OPENGL_VERSION   ""       CACHE STRING "Specify minimum opengl version" )

cmake/bgfx.cmake

@@ -40,7 +40,11 @@ else()
 endif()
 
 # Create the bgfx target
-add_library( bgfx ${BGFX_LIBRARY_TYPE} ${BGFX_SOURCES} )
+if(BGFX_LIBRARY_TYPE STREQUAL STATIC)
+    add_library( bgfx STATIC ${BGFX_SOURCES} )
+else()
+    add_library( bgfx SHARED ${BGFX_SOURCES} )
+endif()
 
 if(BGFX_CONFIG_RENDERER_WEBGPU)
     include(cmake/3rdparty/webgpu.cmake)
@@ -52,12 +56,6 @@ if(BGFX_CONFIG_RENDERER_WEBGPU)
     endif()
 endif()
 
-# Enable BGFX_CONFIG_DEBUG in Debug configuration
-target_compile_definitions( bgfx PRIVATE "$<$<CONFIG:Debug>:BGFX_CONFIG_DEBUG=1>" )
-if(BGFX_CONFIG_DEBUG)
-	target_compile_definitions( bgfx PRIVATE BGFX_CONFIG_DEBUG=1)
-endif()
-
 if( NOT ${BGFX_OPENGL_VERSION} STREQUAL "" )
 	target_compile_definitions( bgfx PRIVATE BGFX_CONFIG_RENDERER_OPENGL_MIN_VERSION=${BGFX_OPENGL_VERSION} )
 endif()
@@ -71,6 +69,14 @@ if( MSVC )
 	target_compile_definitions( bgfx PRIVATE "_CRT_SECURE_NO_WARNINGS" )
 endif()
 
+# Add debug config required in bx headers since bx is private
+if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+    target_compile_definitions( bgfx PUBLIC "BX_CONFIG_DEBUG=1" )
+else()
+    target_compile_definitions( bgfx PUBLIC "BX_CONFIG_DEBUG=0" )
+endif()
+
+
 # Includes
 target_include_directories( bgfx
 	PRIVATE
@@ -86,15 +92,20 @@ target_link_libraries( bgfx PRIVATE bx bimg )
 
 # Frameworks required on iOS, tvOS and macOS
 if( ${CMAKE_SYSTEM_NAME} MATCHES iOS|tvOS )
-	target_link_libraries (bgfx PUBLIC "-framework OpenGLES  -framework Metal -framework UIKit -framework CoreGraphics -framework QuartzCore")
+	target_link_libraries (bgfx PUBLIC 
+		"-framework OpenGLES -framework Metal -framework UIKit -framework CoreGraphics -framework QuartzCore -framework IOKit -framework CoreFoundation")
 elseif( APPLE )
 	find_library( COCOA_LIBRARY Cocoa )
 	find_library( METAL_LIBRARY Metal )
 	find_library( QUARTZCORE_LIBRARY QuartzCore )
+	find_library( IOKIT_LIBRARY IOKit )
+	find_library( COREFOUNDATION_LIBRARY CoreFoundation )
 	mark_as_advanced( COCOA_LIBRARY )
 	mark_as_advanced( METAL_LIBRARY )
 	mark_as_advanced( QUARTZCORE_LIBRARY )
-	target_link_libraries( bgfx PUBLIC ${COCOA_LIBRARY} ${METAL_LIBRARY} ${QUARTZCORE_LIBRARY} )
+	mark_as_advanced( IOKIT_LIBRARY )
+	mark_as_advanced( COREFOUNDATION_LIBRARY )
+	target_link_libraries( bgfx PUBLIC ${COCOA_LIBRARY} ${METAL_LIBRARY} ${QUARTZCORE_LIBRARY} ${IOKIT_LIBRARY} ${COREFOUNDATION_LIBRARY} )
 endif()
 
 if( UNIX AND NOT APPLE AND NOT EMSCRIPTEN AND NOT ANDROID )

cmake/bx.cmake

@@ -67,9 +67,10 @@ target_compile_definitions( bx PUBLIC "__STDC_LIMIT_MACROS" )
 target_compile_definitions( bx PUBLIC "__STDC_FORMAT_MACROS" )
 target_compile_definitions( bx PUBLIC "__STDC_CONSTANT_MACROS" )
 
-target_compile_definitions( bx PRIVATE "$<$<CONFIG:Debug>:BX_CONFIG_DEBUG=1>" )
-if(BGFX_CONFIG_DEBUG)
-	target_compile_definitions( bx PRIVATE BX_CONFIG_DEBUG=1)
+if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+	target_compile_definitions( bx PUBLIC "BX_CONFIG_DEBUG=1" )
+else()
+	target_compile_definitions( bx PUBLIC "BX_CONFIG_DEBUG=0" )
 endif()
 
 # Additional dependencies on Unix

cmake/shared.cmake

@@ -21,13 +21,6 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/shader.cpp.in
 target_sources( bgfx-shader INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/shader.cpp )
 target_include_directories( bgfx-shader INTERFACE ${BGFX_DIR}/include )
 
-add_library( bgfx-bounds INTERFACE )
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/bounds.cpp.in
-                ${CMAKE_CURRENT_BINARY_DIR}/generated/bounds.cpp )
-target_sources( bgfx-bounds INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/bounds.cpp )
-target_include_directories( bgfx-bounds INTERFACE ${BGFX_DIR}/include )
-target_include_directories( bgfx-bounds INTERFACE ${BGFX_DIR}/examples/common )
-
 # Frameworks required on OS X
 if( ${CMAKE_SYSTEM_NAME} MATCHES Darwin )
 	find_library( COCOA_LIBRARY Cocoa )

cmake/tools/geometryc.cmake

@@ -15,7 +15,7 @@ include( cmake/3rdparty/meshoptimizer.cmake )
 add_executable( geometryc ${BGFX_DIR}/tools/geometryc/geometryc.cpp )
 target_compile_definitions( geometryc PRIVATE "-D_CRT_SECURE_NO_WARNINGS" )
 set_target_properties( geometryc PROPERTIES FOLDER "bgfx/tools" )
-target_link_libraries( geometryc bx bgfx-bounds bgfx-vertexlayout meshoptimizer )
+target_link_libraries( geometryc bx bgfx-vertexlayout meshoptimizer )
 if( BGFX_CUSTOM_TARGETS )
 	add_dependencies( tools geometryc )
 endif()