Merge branch 'master' into for-0.56.0/sync

Author: illwieckz

CMakeLists.txt

@@ -778,16 +778,20 @@ endif()
 option(PREFER_EXTERNAL_LIBS "Tries to use system libs where possible." ON)
 
 macro(prefer_package LIB_NAME LIB_CMAKE)
-    if (PREFER_EXTERNAL_LIBS AND NOT NACL)
-        find_package(${LIB_NAME})
+    if (NOT ${LIB_NAME}_FOUND)
+        if (PREFER_EXTERNAL_LIBS AND NOT NACL)
+            find_package(${LIB_NAME})
 
-        if (NOT ${LIB_NAME}_FOUND)
-            message(WARNING "PREFER_EXTERNAL_LIBS is enabled but external ${LIB_NAME} is not found, falling back to vendored ${LIB_NAME}.")
+            if (NOT ${LIB_NAME}_FOUND)
+                message(WARNING "PREFER_EXTERNAL_LIBS is enabled but external ${LIB_NAME} is not found, falling back to vendored ${LIB_NAME}.")
+            endif()
         endif()
-    endif()
 
-    if (NOT ${LIB_NAME}_FOUND)
-        include(${LIB_CMAKE})
+        if (NOT ${LIB_NAME}_FOUND)
+            include(${LIB_CMAKE})
+
+            set(${LIB_NAME}_FOUND ON)
+        endif()
     endif()
 endmacro()
 
@@ -817,7 +821,6 @@ if (BUILD_CLIENT)
     set(LIBS_CLIENT ${LIBS_CLIENT} ${PNG_LIBRARIES})
 
     prefer_package(Freetype ${DAEMON_DIR}/freetype.cmake)
-
     include_directories(${FREETYPE_INCLUDE_DIRS})
     set(LIBS_CLIENT ${LIBS_CLIENT} ${FREETYPE_LIBRARIES})
 

cmake/DaemonFlags.cmake

@@ -381,6 +381,8 @@ else()
 		# Don't set _FORTIFY_SOURCE in debug builds.
 	endif()
 
+	try_c_cxx_flag(FPIC "-fPIC")
+
 	if (USE_HARDENING)
 		# PNaCl accepts the flags but does not define __stack_chk_guard and __stack_chk_fail.
 		if (NOT NACL)
@@ -395,8 +397,6 @@ else()
 		try_c_cxx_flag(WSTACK_PROTECTOR "-Wstack-protector")
 
 		if (NOT NACL OR (NACL AND GAME_PIE))
-			try_c_cxx_flag(FPIC "-fPIC")
-
 			# The -pie flag requires -fPIC:
 			# > ld: error: relocation R_X86_64_64 cannot be used against local symbol; recompile with -fPIC
 			# This flag isn't used on macOS:

cmake/DaemonGame.cmake

@@ -68,40 +68,42 @@ set(SHAREDLIST_sgame
 include(CMakeParseArguments)
 
 # The NaCl SDK only runs on amd64 or i686.
-if (CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME
-AND (ARCH STREQUAL "amd64" OR ARCH STREQUAL "i686"))
-	# can be loaded by daemon with vm.[sc]game.type 0 or 1
-	option(BUILD_GAME_NACL "Build the NaCl \"pexe\" and \"nexe\" gamelogic modules for enabled architecture targets, required to host mods." OFF)
-
-	set(NACL_ALL_TARGETS "amd64;i686;armhf")
-	set(BUILD_GAME_NACL_TARGETS "all" CACHE STRING "Enabled NaCl \"nexe\" architecture targets, values: ${NACL_ALL_TARGETS}, all, native, none.")
-	mark_as_advanced(BUILD_GAME_NACL_TARGETS)
-
-	if (BUILD_GAME_NACL_TARGETS STREQUAL "all")
-		set(NACL_TARGETS "${NACL_ALL_TARGETS}")
-	elseif (BUILD_GAME_NACL_TARGETS STREQUAL "native")
-		set(NACL_TARGETS "${ARCH}")
-	elseif (BUILD_GAME_NACL_TARGETS STREQUAL "none")
-		set(NACL_TARGETS "")
-	else()
-		set(NACL_TARGETS "${BUILD_GAME_NACL_TARGETS}")
-	endif()
+if (NOT FORK EQUAL 2)
+	if (CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME
+	AND (ARCH STREQUAL "amd64" OR ARCH STREQUAL "i686"))
+		# can be loaded by daemon with vm.[sc]game.type 0 or 1
+		option(BUILD_GAME_NACL "Build the NaCl \"pexe\" and \"nexe\" gamelogic modules for enabled architecture targets, required to host mods." OFF)
+
+		set(NACL_ALL_TARGETS "amd64;i686;armhf")
+		set(BUILD_GAME_NACL_TARGETS "all" CACHE STRING "Enabled NaCl \"nexe\" architecture targets, values: ${NACL_ALL_TARGETS}, all, native, none.")
+		mark_as_advanced(BUILD_GAME_NACL_TARGETS)
+
+		if (BUILD_GAME_NACL_TARGETS STREQUAL "all")
+			set(NACL_TARGETS "${NACL_ALL_TARGETS}")
+		elseif (BUILD_GAME_NACL_TARGETS STREQUAL "native")
+			set(NACL_TARGETS "${ARCH}")
+		elseif (BUILD_GAME_NACL_TARGETS STREQUAL "none")
+			set(NACL_TARGETS "")
+		else()
+			set(NACL_TARGETS "${BUILD_GAME_NACL_TARGETS}")
+		endif()
+
+		foreach(NACL_TARGET ${NACL_TARGETS})
+			set(IS_NACL_VALID_TARGET OFF)
+			foreach(NACL_VALID_TARGET ${NACL_ALL_TARGETS})
+				if(NACL_TARGET STREQUAL NACL_VALID_TARGET)
+					set(IS_NACL_VALID_TARGET ON)
+				endif()
+			endforeach()
 
-	foreach(NACL_TARGET ${NACL_TARGETS})
-		set(IS_NACL_VALID_TARGET OFF)
-		foreach(NACL_VALID_TARGET ${NACL_ALL_TARGETS})
-			if(NACL_TARGET STREQUAL NACL_VALID_TARGET)
-				set(IS_NACL_VALID_TARGET ON)
+			if (NOT IS_NACL_VALID_TARGET)
+				message(FATAL_ERROR "Invalid NaCl target ${NACL_TARGET}, must be one of ${NACL_ALL_TARGETS}")
 			endif()
 		endforeach()
-
-		if (NOT IS_NACL_VALID_TARGET)
-			message(FATAL_ERROR "Invalid NaCl target ${NACL_TARGET}, must be one of ${NACL_ALL_TARGETS}")
-		endif()
-	endforeach()
-else()
-	set(BUILD_GAME_NACL OFF)
-	set(NACL_TARGETS "")
+	else()
+		set(BUILD_GAME_NACL OFF)
+		set(NACL_TARGETS "")
+	endif()
 endif()
 
 daemon_write_buildinfo("Game")
@@ -137,9 +139,9 @@ function(buildGameModule module_slug)
 endfunction()
 
 function(gameSubProject)
-	ExternalProject_Add(${VMS_PROJECT}
+	ExternalProject_Add(${NACL_VMS_PROJECT}
 		SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-		BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${VMS_PROJECT}
+		BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${NACL_VMS_PROJECT}
 		CMAKE_GENERATOR ${VM_GENERATOR}
 		CMAKE_ARGS
 			-DFORK=2
@@ -154,10 +156,10 @@ function(gameSubProject)
 	)
 
 	# Force the rescan and rebuild of the subproject.
-	ExternalProject_Add_Step(${VMS_PROJECT} forcebuild
+	ExternalProject_Add_Step(${NACL_VMS_PROJECT} forcebuild
 		COMMAND ${CMAKE_COMMAND} -E remove
-			${CMAKE_CURRENT_BINARY_DIR}/${VMS_PROJECT}-prefix/src/${VMS_PROJECT}-stamp/${VMS_PROJECT}-configure
-		COMMENT "Forcing build step for '${VMS_PROJECT}'"
+			${CMAKE_CURRENT_BINARY_DIR}/${NACL_VMS_PROJECT}-prefix/src/${NACL_VMS_PROJECT}-stamp/${NACL_VMS_PROJECT}-configure
+		COMMENT "Forcing build step for '${NACL_VMS_PROJECT}'"
 		DEPENDEES build
 		ALWAYS 1
 	)
@@ -201,7 +203,7 @@ function(GAMEMODULE)
 		if (BUILD_GAME_NACL)
 			if (USE_NACL_SAIGO)
 				add_custom_target(nacl-vms ALL)
-				unset(VMS_PROJECTS)
+				unset(NACL_VMS_PROJECTS)
 
 				foreach(NACL_TARGET ${NACL_TARGETS})
 					if (NACL_TARGET STREQUAL "i686")
@@ -214,9 +216,9 @@ function(GAMEMODULE)
 						message(FATAL_ERROR "Unknown NaCl architecture ${NACL_TARGET}")
 					endif()
 
-					set(VMS_PROJECT nacl-vms-${NACL_TARGET})
-					list(APPEND VMS_PROJECTS ${VMS_PROJECT})
-					add_dependencies(nacl-vms ${VMS_PROJECT})
+					set(NACL_VMS_PROJECT nacl-vms-${NACL_TARGET})
+					list(APPEND NACL_VMS_PROJECTS ${NACL_VMS_PROJECT})
+					add_dependencies(nacl-vms ${NACL_VMS_PROJECT})
 
 					gameSubProject(
 						-DCMAKE_TOOLCHAIN_FILE=${Daemon_SOURCE_DIR}/cmake/toolchain-saigo.cmake
@@ -229,8 +231,8 @@ function(GAMEMODULE)
 					)
 				endforeach()
 			else()
-				set(VMS_PROJECT nacl-vms)
-				set(VMS_PROJECTS ${VMS_PROJECT})
+				set(NACL_VMS_PROJECT nacl-vms)
+				set(NACL_VMS_PROJECTS ${NACL_VMS_PROJECT})
 
 				# Workaround a bug where CMake ExternalProject lists-as-args are cut on first “;”
 				string(REPLACE ";" "," NACL_TARGETS_STRING "${NACL_TARGETS}")
@@ -245,7 +247,7 @@ function(GAMEMODULE)
 			endif()
 		endif()
 
-		set(VMS_PROJECTS ${VMS_PROJECTS} PARENT_SCOPE)
+		set(NACL_VMS_PROJECTS ${NACL_VMS_PROJECTS} PARENT_SCOPE)
 	elseif (FORK EQUAL 2)
 		if (BUILD_GAME_NACL)
 			if (USE_NACL_SAIGO)

freetype.cmake

@@ -2,24 +2,37 @@ set(FREETYPE_DIR ${DAEMON_DIR}/libs/freetype)
 set(FREETYPE_INCLUDE_DIRS ${FREETYPE_DIR}/include)
 set(FREETYPE_LIBRARIES freetype)
 
-option(FT_DISABLE_BROTLI "Disable Brotli" ON)
-option(FT_DISABLE_BZIP2 "Disable bzip2" ON)
-option(FT_DISABLE_HARFBUZZ "Disable HarfBuzz" ON)
-option(FT_DISABLE_PNG "Disable PNG" ON)
-
-if (PREFER_EXTERNAL_LIBS AND NOT NACL)
-	set(FREETYPE_INTERNAL_ZLIB OFF)
-else()
+if (NACL)
+	# Using Freetype's own zlib prevents the need for a zlib submodule when building the nexe cgame.
 	set(FREETYPE_INTERNAL_ZLIB ON)
+else()
+	# Even if we can build an engine with Freetype using its internal zlib, we better rely on the
+	# external zlib even if PREFER_EXTERNAL_LIBS is OFF, because then it will avoid zlib duplication
+	# and share the same zlib between Freetype and the libpng.
+	set(FREETYPE_INTERNAL_ZLIB OFF)
+endif()
+
+if (NOT FREETYPE_INTERNAL_ZLIB)
+	find_package(ZLIB REQUIRED)
+	set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} ${ZLIB_LIBRARIES})
 endif()
 
-set(FT_DISABLE_ZLIB ${FREETYPE_INTERNAL_ZLIB} CACHE BOOL "Disable external zlib" FORCE)
+# Do not re-add the target if already set to be built.
+# For example both the engine and a native game may request Freetype
+# to be built, but we need to only build once for both.
+if (NOT TARGET freetype)
+	option(FT_DISABLE_BROTLI "Disable Brotli" ON)
+	option(FT_DISABLE_BZIP2 "Disable bzip2" ON)
+	option(FT_DISABLE_HARFBUZZ "Disable HarfBuzz" ON)
+	option(FT_DISABLE_PNG "Disable PNG" ON)
+	set(FT_DISABLE_ZLIB ${FREETYPE_INTERNAL_ZLIB} CACHE BOOL "Disable external zlib" FORCE)
 
-add_subdirectory(${FREETYPE_DIR})
+	add_subdirectory(${FREETYPE_DIR})
 
-mark_as_advanced(FT_DISABLE_BROTLI)
-mark_as_advanced(FT_DISABLE_BZIP2)
-mark_as_advanced(FT_DISABLE_HARFBUZZ)
-mark_as_advanced(FT_DISABLE_PNG)
-mark_as_advanced(FT_DISABLE_ZLIB)
-mark_as_advanced(FT_ENABLE_ERROR_STRINGS)
+	mark_as_advanced(FT_DISABLE_BROTLI)
+	mark_as_advanced(FT_DISABLE_BZIP2)
+	mark_as_advanced(FT_DISABLE_HARFBUZZ)
+	mark_as_advanced(FT_DISABLE_PNG)
+	mark_as_advanced(FT_DISABLE_ZLIB)
+	mark_as_advanced(FT_ENABLE_ERROR_STRINGS)
+endif()