Avoid linking to PVRTexLib when PVRTC is disabled.

Only link to PVRTexLib if CUTTLEFISH_BUILD_PVRTC is set. This avoids
situations where the include dirs and library variables may be set with a
previous call to find. (e.g. toggling the option) Also avoid calling
find_package(PVRTexLib) in the tool for the Mac rpath fixup unless PVRTC
is enabled.

Author: akb825

lib/CMakeLists.txt

@@ -86,14 +86,17 @@ target_include_directories(cuttlefish_lib
 			${BC7ENC_INCLUDE_DIRS}
 			${ETC_INCLUDE_DIRS}
 			${ASTC_INCLUDE_DIRS}
-			${PVRTEXLIB_INCLUDE_DIRS}
 			glm
 			src)
-target_link_libraries(cuttlefish_lib
-	PRIVATE ${FreeImage_LIBRARIES} ${PVRTEXLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(cuttlefish_lib PRIVATE ${FreeImage_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 target_compile_definitions(cuttlefish_lib PUBLIC ${defines} PRIVATE ${privateDefines})
 
 if (CUTTLEFISH_BUILD_PVRTC AND PVRTEXLIB_FOUND)
+	# Delay linking to PVRTexLib to here in case CUTTLEFISH_BUILD_PVRTC was toggled and the include
+	# dirs and library variables are still set.
+	target_include_directories(cuttlefish_lib PRIVATE ${PVRTEXLIB_INCLUDE_DIRS})
+	target_link_libraries(cuttlefish_lib PRIVATE ${PVRTEXLIB_LIBRARIES})
+
 	if (WIN32)
 		get_filename_component(pvrTexLibDir ${PVRTEXLIB_LIB} DIRECTORY)
 		set(pvrTexLibDll ${pvrTexLibDir}/PVRTexLib.dll)

lib/test/CMakeLists.txt

@@ -12,7 +12,7 @@ target_link_libraries(cuttlefish_test PRIVATE
 	cuttlefish_lib
 	${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 
-if (APPLE AND CUTTLEFISH_BUILD_PVRTC AND PVRTEXLIB_FOUND AND NOT CUTTLEFISH_SHARED)
+if (APPLE AND CUTTLEFISH_BUILD_PVRTC AND NOT CUTTLEFISH_SHARED AND PVRTEXLIB_FOUND)
 	cfs_fixup_mac_dep(cuttlefish_test "@executable_path/../lib/libPVRTexLib.dylib"
 		"@rpath/libPVRTexLib.dylib")
 endif()

tool/CMakeLists.txt

@@ -5,10 +5,12 @@ target_link_libraries(cuttlefish PRIVATE cuttlefish_lib)
 
 cfs_set_folder(cuttlefish tools)
 
-find_package(PVRTexLib QUIET)
-if (APPLE AND CUTTLEFISH_BUILD_PVRTC AND PVRTEXLIB_FOUND AND NOT CUTTLEFISH_SHARED)
-	cfs_fixup_mac_dep(cuttlefish "@executable_path/../lib/libPVRTexLib.dylib"
-		"@rpath/libPVRTexLib.dylib")
+if (APPLE AND CUTTLEFISH_BUILD_PVRTC AND NOT CUTTLEFISH_SHARED)
+	find_package(PVRTexLib QUIET)
+	if (PVRTEXLIB_FOUND)
+		cfs_fixup_mac_dep(cuttlefish "@executable_path/../lib/libPVRTexLib.dylib"
+			"@rpath/libPVRTexLib.dylib")
+	endif()
 endif()
 
 if (CUTTLEFISH_INSTALL)