NOISSUE move bundle utilities magic back to the application folder

This may fix macOS issues?
2018-01-27 21:59:06 +01:00
parent cd55674b36
commit d66ae206dd
4 changed files with 73 additions and 73 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,10 +258,6 @@ add_subdirectory(libraries/classparser) # google analytics library

 add_subdirectory(api/logic)
 add_subdirectory(api/gui)
-add_subdirectory(application)

-# Bundle utilities are used to complete the portable packages - they add all the libraries that would otherwise be missing on the target system.
 # NOTE: this must always be last to appease the CMake deity of quirky install command evaluation order.
-if(INSTALL_BUNDLE STREQUAL "full")
-	add_subdirectory(bundle)
-endif()
+add_subdirectory(application)
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -272,3 +272,75 @@ install(TARGETS MultiMC
 	LIBRARY DESTINATION ${LIBRARY_DEST_DIR} COMPONENT Runtime
 	RUNTIME DESTINATION ${BINARY_DEST_DIR} COMPONENT Runtime
 )
+
+#### The MultiMC bundle mess! ####
+# Bundle utilities are used to complete the portable packages - they add all the libraries that would otherwise be missing on the target system.
+# NOTE: it seems that this absolutely has to be here, and nowhere else.
+if(INSTALL_BUNDLE STREQUAL "full")
+	# Add qt.conf - this makes Qt stop looking for things outside the bundle
+	install(
+		CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}/qt.conf\" \" \")"
+		COMPONENT Runtime
+	)
+	# Bundle plugins
+	if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+		# Image formats
+		install(
+			DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
+			DESTINATION ${PLUGIN_DEST_DIR}
+			COMPONENT Runtime
+			REGEX "tga|tiff|mng|webp" EXCLUDE
+		)
+		# Icon engines
+		install(
+			DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
+			DESTINATION ${PLUGIN_DEST_DIR}
+			COMPONENT Runtime
+			REGEX "fontawesome" EXCLUDE
+		)
+		# Platform plugins
+		install(
+			DIRECTORY "${QT_PLUGINS_DIR}/platforms"
+			DESTINATION ${PLUGIN_DEST_DIR}
+			COMPONENT Runtime
+			REGEX "minimal|linuxfb|offscreen" EXCLUDE
+		)
+	else()
+		# Image formats
+		install(
+			DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
+			DESTINATION ${PLUGIN_DEST_DIR}
+			COMPONENT Runtime
+			REGEX "tga|tiff|mng|webp" EXCLUDE
+			REGEX "d\\." EXCLUDE
+			REGEX "_debug\\." EXCLUDE
+			REGEX "\\.dSYM" EXCLUDE
+		)
+		# Icon engines
+		install(
+			DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
+			DESTINATION ${PLUGIN_DEST_DIR}
+			COMPONENT Runtime
+			REGEX "fontawesome" EXCLUDE
+			REGEX "d\\." EXCLUDE
+			REGEX "_debug\\." EXCLUDE
+			REGEX "\\.dSYM" EXCLUDE
+		)
+		# Platform plugins
+		install(
+			DIRECTORY "${QT_PLUGINS_DIR}/platforms"
+			DESTINATION ${PLUGIN_DEST_DIR}
+			COMPONENT Runtime
+			REGEX "minimal|linuxfb|offscreen" EXCLUDE
+			REGEX "d\\." EXCLUDE
+			REGEX "_debug\\." EXCLUDE
+			REGEX "\\.dSYM" EXCLUDE
+		)
+	endif()
+	configure_file(
+		"${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"
+		"${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake"
+		@ONLY
+	)
+	install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime)
+endif()
--- a/application/install_prereqs.cmake.in
+++ b/application/install_prereqs.cmake.in
--- a/bundle/CMakeLists.txt
+++ b/bundle/CMakeLists.txt
@@ -1,68 +0,0 @@
-#### The MultiMC bundle mess! ####
-
-# Add qt.conf - this makes Qt stop looking for things outside the bundle
-install(
-	CODE "file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${RESOURCES_DEST_DIR}/qt.conf\" \" \")"
-	COMPONENT Runtime
-)
-# Bundle plugins
-if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-	# Image formats
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "tga|tiff|mng|webp" EXCLUDE
-	)
-	# Icon engines
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "fontawesome" EXCLUDE
-	)
-	# Platform plugins
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/platforms"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "minimal|linuxfb|offscreen" EXCLUDE
-	)
-else()
-	# Image formats
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/imageformats"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "tga|tiff|mng|webp" EXCLUDE
-		REGEX "d\\." EXCLUDE
-		REGEX "_debug\\." EXCLUDE
-		REGEX "\\.dSYM" EXCLUDE
-	)
-	# Icon engines
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/iconengines"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "fontawesome" EXCLUDE
-		REGEX "d\\." EXCLUDE
-		REGEX "_debug\\." EXCLUDE
-		REGEX "\\.dSYM" EXCLUDE
-	)
-	# Platform plugins
-	install(
-		DIRECTORY "${QT_PLUGINS_DIR}/platforms"
-		DESTINATION ${PLUGIN_DEST_DIR}
-		COMPONENT Runtime
-		REGEX "minimal|linuxfb|offscreen" EXCLUDE
-		REGEX "d\\." EXCLUDE
-		REGEX "_debug\\." EXCLUDE
-		REGEX "\\.dSYM" EXCLUDE
-	)
-endif()
-configure_file(
-	"${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in"
-	"${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake"
-	@ONLY
-)
-install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime)