Attempt to fix linking on Linux #82

EQMG · Sep 27, 2019 · 9a8db3c · 9a8db3c
1 parent 4a3c209
commit 9a8db3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -90,8 +90,10 @@ if(NOT PHYSFS_FOUND)
 		FetchContent_Populate(physfs)
 		add_subdirectory(${physfs_SOURCE_DIR} ${physfs_BINARY_DIR})
 	endif()
-	set_target_properties(physfs PROPERTIES FOLDER physfs)
 	set_target_properties(physfs-static PROPERTIES FOLDER physfs)
+	if(TARGET physfs)
+		set_target_properties(physfs PROPERTIES FOLDER physfs)
+	endif()
 	if(TARGET physfs-docs)
 		set_target_properties(physfs-docs PROPERTIES FOLDER physfs)
 	endif()
@@ -119,7 +121,7 @@ if(NOT Freetype_FOUND)
 			)
 	FetchContent_GetProperties(freetype)
 	if(NOT freetype_POPULATED)
-		foreach(_freetype_option "CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz")
+		foreach(_freetype_option "CMAKE_DISABLE_FIND_PACKAGE_PNG" "CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz")
 			set(${_freetype_option} ON CACHE INTERNAL "")
 		endforeach()
 		FetchContent_Populate(freetype)

diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
@@ -62,6 +62,8 @@ target_link_libraries(Acid
 		# All IMPORTED targets, which automatically handles includes
 		Threads::Threads
 		Vulkan::Vulkan
+		# Filesystem
+		$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:stdc++fs>
 		# Unix
 		${CMAKE_DL_LIBS}
 		# Windows