Proper cmake patching

Author: FriwiDev

CMakeLists.txt

@@ -18,6 +18,10 @@ COPY out/linux* /prebuild
 #Copy additional natives
 COPY natives /natives
 
+#Copy cmake patching script
+COPY scripts/patch_cmake.py .
+COPY patch/CMakeLists.txt.patch .
+
 #Copy and launch run script
 COPY scripts/run_linux.sh .
 RUN chmod +x run_linux.sh

DockerfileLinux

@@ -2,6 +2,10 @@ FROM friwidev/jcefdocker:windows-latest
 
 WORKDIR C:/
 
+#Copy cmake patching script
+COPY scripts/patch_cmake.py .
+COPY patch/CMakeLists.txt.patch .
+
 #Copy and launch run script
 COPY scripts/run_windows.bat .
 ENTRYPOINT ["run_windows.bat"]

DockerfileWindows

@@ -0,0 +1,44 @@
+# Determine the platform.
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+  if("${PROJECT_ARCH}" STREQUAL "arm64")
+    set(CEF_PLATFORM "macosarm64")
+  else()
+    set(CEF_PLATFORM "macosx64")
+  endif()
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+  if("${PROJECT_ARCH}" STREQUAL "amd64")
+    set(CEF_PLATFORM "linux64")
+  elseif("${PROJECT_ARCH}" STREQUAL "arm64")
+    set(CEF_PLATFORM "linuxarm64")
+  elseif("${PROJECT_ARCH}" STREQUAL "arm/v6")
+    set(CEF_PLATFORM "linuxarm")
+  else()
+    set(CEF_PLATFORM "linux32")
+  endif()
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+  #Stolen from Jetbrains jcef repository for the arm64 windows build
+  if(MSVC)
+    include(CheckSymbolExists)
+
+    # MSVC predefines _M_ARM64 for compilations that target ARM64
+    # and _M_AMD64 for compilations that target x86_64.
+    check_symbol_exists("_M_ARM64" "" CEF_PLATFORM_WINARM64)
+    check_symbol_exists("_M_AMD64" "" CEF_PLATFORM_WIN64)
+
+    # We also should set PROJECT_ARCH explicitly because FindCEF.cmake deduces it incorrectly for
+    # cross-compilation cases.
+    if(CEF_PLATFORM_WINARM64)
+      set(CEF_PLATFORM "windowsarm64")
+      set(PROJECT_ARCH "arm64")
+    elseif(CEF_PLATFORM_WIN64)
+      set(CEF_PLATFORM "windows64")
+      set(PROJECT_ARCH "x86_64")
+    else()
+      set(CEF_PLATFORM "windows32")
+      set(PROJECT_ARCH "x86")
+    endif()
+  else()
+    message(FATAL_ERROR "Building JCEF for Windows using non-MSVC compiler is not supported.")
+  endif()
+endif()
+

patch/CMakeLists.txt.patch

@@ -0,0 +1,34 @@
+#Small script to patch CMakeLists.txt files with custom build options
+#Will replace file contents between two markers ("Determine the platform"
+#and "Add this project's cmake")
+#Usage: python patch_cmake.py <input> <patch>
+
+import sys
+
+input = sys.argv[1]
+patch = sys.argv[2]
+
+print("Patching "+input+" to accept further build architectures...")
+
+f = open(input, "r")
+p = open(patch, "r")
+result = ""
+inpatch = False
+for x in f:
+  if x.startswith("# Determine the platform"):
+    inpatch = True
+    for y in p:
+      result += y
+  elif x.startswith("# Add this project's cmake"):
+    inpatch = False
+  if inpatch == False:
+    result += x
+
+f.close()
+p.close()
+
+f = open(input, "w")
+f.write(result)
+f.close()
+
+print("Done.")

scripts/patch_cmake.py

@@ -23,14 +23,14 @@ if [ ! -f "/jcef/README.md" ]; then
     git clone ${REPO} /jcef
     cd /jcef
     git checkout ${REF}
-    #Temporary CMakeLists patching - beautify in the future
-    rm CMakeLists.txt
-    curl -o CMakeLists.txt https://raw.githubusercontent.com/jcefmaven/jcefbuild/master/CMakeLists.txt
 else
     echo "Found existing files to build"
     cd /jcef
 fi
 
+#CMakeLists patching 
+python3 /builder/patch_cmake.py CMakeLists.txt /builder/CMakeLists.txt.patch
+
 # Create and enter the `jcef_build` directory.
 # The `jcef_build` directory name is required by other JCEF tooling
 # and should not be changed.

scripts/run_linux.sh

@@ -12,9 +12,8 @@ if exist "jcef\README.md" (echo "Found existing files to build" && cd jcef) ^
 else (echo "Did not find files to build - cloning..." && GOTO :CLONE)
 
 :BUILD
-:: Temporary CMakeLists patching - beautify in the future
-del /f CMakeLists.txt
-curl -o CMakeLists.txt https://raw.githubusercontent.com/jcefmaven/jcefbuild/master/CMakeLists.txt
+:: CMakeLists patching 
+python3 C:/patch_cmake.py CMakeLists.txt C:/CMakeLists.txt.patch
 
 :: Prepare build dir
 mkdir jcef_build && cd jcef_build