Merge remote-tracking branch 'origin/feature_cmake_style' into develop

Conflicts:
	CMakeLists.txt

dependencies.cmake.in

@@ -1,33 +0,0 @@
-cmake_minimum_required(VERSION 2.8.9)
-
-message(STATUS "Running install script...")
-
-SET(Qt5_DIR @Qt5_DIR@)
-
-IF(WIN32)
-SET(LIB_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-ELSE()
-SET(LIB_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/lib)
-ENDIF()
-
-INCLUDE(GetPrerequisites)
-GET_PREREQUISITES(@BINARY_LOCATION@ MULTIMC_PREREQS 1 1 "" "")
-
-message(STATUS "Prerequisites: ${MULTIMC_PREREQS}")
-
-FOREACH(PREREQ ${MULTIMC_PREREQS})
-	GET_FILENAME_COMPONENT(PREREQ_NAME "${PREREQ}" NAME)
-	GET_FILENAME_COMPONENT(PREREQ_ACTUAL "${PREREQ}" REALPATH)
-	IF(WIN32)
-	SET(PREREQ_ACTUAL "${Qt5_DIR}/bin/${PREREQ}")
-	ENDIF()
-	
-	message(STATUS "Adding install prerequisite: ${PREREQ_NAME}")
-	
-	FILE(INSTALL
-		DESTINATION "${LIB_INSTALL_PREFIX}"
-		TYPE PROGRAM
-		RENAME "${PREREQ_NAME}"
-		FILES "${PREREQ_ACTUAL}"
-	)
-ENDFOREACH()

depends/classparser/CMakeLists.txt

@@ -8,7 +8,7 @@ find_package(Qt5Core REQUIRED)
 # Include Qt headers.
 include_directories(${Qt5Base_INCLUDE_DIRS})
 
-SET(CLASSPARSER_HEADERS
+set(CLASSPARSER_HEADERS
 include/classparser_config.h
 
 # Public headers
@@ -23,13 +23,13 @@ src/javaendian.h
 src/membuffer.h
 )
 
-SET(CLASSPARSER_SOURCES
+set(CLASSPARSER_SOURCES
 src/javautils.cpp
 src/annotations.cpp
 )
 
 # Set the include dir path.
-SET(LIBGROUPVIEW_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
+set(LIBGROUPVIEW_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
 
 # Include self.
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)

depends/javacheck/CMakeLists.txt

@@ -12,4 +12,4 @@ set(SRC
 
 add_jar(JavaCheck ${SRC})
 
-INSTALL_JAR(JavaCheck "${BINARY_DEST_DIR}/jars")
+install_jar(JavaCheck "${BINARY_DEST_DIR}/jars")

depends/launcher/CMakeLists.txt

@@ -32,4 +32,4 @@ set(SRC
 )
 add_jar(NewLaunch ${SRC})
 
-INSTALL_JAR(NewLaunch "${BINARY_DEST_DIR}/jars")
+install_jar(NewLaunch "${BINARY_DEST_DIR}/jars")

depends/pack200/CMakeLists.txt

@@ -1,59 +1,59 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+cmake_minimum_required(VERSION 2.6)
 
-IF(WIN32)
+if(WIN32)
 	# In Qt 5.1+ we have our own main() function, don't autolink to qtmain on Windows
 	cmake_policy(SET CMP0020 OLD)
-ENDIF()
+endif()
 
 project(unpack200)
 
 # Find ZLIB for quazip
 # Use system zlib on unix and Qt ZLIB on Windows
-IF(UNIX)
+if(UNIX)
 	find_package(ZLIB REQUIRED)
-ELSE(UNIX)
+else(UNIX)
-	get_filename_component (ZLIB_FOUND_DIR "${Qt5Core_DIR}/../../../include/QtZlib" ABSOLUTE)
+	get_filename_component(ZLIB_FOUND_DIR "${Qt5Core_DIR}/../../../include/QtZlib" ABSOLUTE)
-	SET(ZLIB_INCLUDE_DIRS ${ZLIB_FOUND_DIR} CACHE PATH "Path to ZLIB headers of Qt")
+	set(ZLIB_INCLUDE_DIRS ${ZLIB_FOUND_DIR} CACHE PATH "Path to ZLIB headers of Qt")
-	SET(ZLIB_LIBRARIES "")
+	set(ZLIB_LIBRARIES "")
-	IF(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
+	if(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
-		MESSAGE("Please specify a valid zlib include dir")
+		message("Please specify a valid zlib include dir")
-	ENDIF(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
+	endif(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
-ENDIF(UNIX)
+endif(UNIX)
 
-SET(PACK200_SRC
+set(PACK200_SRC
-include/unpack200.h
+	include/unpack200.h
-src/bands.cpp
+	src/bands.cpp
-src/bands.h
+	src/bands.h
-src/bytes.cpp
+	src/bytes.cpp
-src/bytes.h
+	src/bytes.h
-src/coding.cpp
+	src/coding.cpp
-src/coding.h
+	src/coding.h
-src/constants.h
+	src/constants.h
-src/defines.h
+	src/defines.h
-src/unpack200.cpp
+	src/unpack200.cpp
-src/unpack.cpp
+	src/unpack.cpp
-src/unpack.h
+	src/unpack.h
-src/utils.cpp
+	src/utils.cpp
-src/utils.h
+	src/utils.h
-src/zip.cpp
+	src/zip.cpp
-src/zip.h
+	src/zip.h
 )
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-SET(PACK200_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
+set(PACK200_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
 include_directories(
 	include
 	${ZLIB_INCLUDE_DIRS}
 )
 add_library(unpack200 STATIC ${PACK200_SRC})
 
-IF(UNIX)
+if(UNIX)
 	target_link_libraries(unpack200 ${ZLIB_LIBRARIES})
-ELSE()
+else()
 	# zlib is part of Qt on windows. use it.
-	QT5_USE_MODULES(unpack200 Core)
+	qt5_use_modules(unpack200 Core)
-ENDIF()
+endif()
 
 add_executable(anti200 anti200.cpp)
 target_link_libraries(anti200 unpack200)

depends/quazip/CMakeLists.txt

@@ -2,16 +2,16 @@ project(quazip)
 
 # Find ZLIB for quazip
 # Use system zlib on unix and Qt ZLIB on Windows
-IF(UNIX)
+if(UNIX)
 	find_package(ZLIB REQUIRED)
-ELSE(UNIX)
+else(UNIX)
-	get_filename_component (ZLIB_FOUND_DIR "${Qt5Core_DIR}/../../../include/QtZlib" ABSOLUTE)
+	get_filename_component(ZLIB_FOUND_DIR "${Qt5Core_DIR}/../../../include/QtZlib" ABSOLUTE)
-	SET(ZLIB_INCLUDE_DIRS ${ZLIB_FOUND_DIR} CACHE PATH "Path to ZLIB headers of Qt")
+	set(ZLIB_INCLUDE_DIRS ${ZLIB_FOUND_DIR} CACHE PATH "Path to ZLIB headers of Qt")
-	SET(ZLIB_LIBRARIES "")
+	set(ZLIB_LIBRARIES "")
-	IF(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
+	if(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
-		MESSAGE("Please specify a valid zlib include dir")
+		message("Please specify a valid zlib include dir")
-	ENDIF(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
+	endif(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h")
-ENDIF(UNIX)
+endif(UNIX)
 
 # set all include directories for in and out of source builds
 include_directories(
@@ -20,23 +20,12 @@ include_directories(
 	${ZLIB_INCLUDE_DIRS}
 )
 
-# include with QT_USE selected library parts
-# INCLUDE(${QT_USE_FILE})
-
 file(GLOB SRCS "*.c" "*.cpp")
 file(GLOB PUBLIC_HEADERS "*.h")
 
 # Static link!
-ADD_DEFINITIONS(-DQUAZIP_STATIC)
+add_definitions(-DQUAZIP_STATIC)
-
-#qt5_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
-#set(SRCS ${SRCS} ${MOC_SRCS})
-
-#set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 add_library(quazip STATIC ${SRCS})
-QT5_USE_MODULES(quazip Core)
+qt5_use_modules(quazip Core)
 target_link_libraries(quazip ${ZLIB_LIBRARIES})
-
-#install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip)
-#install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})

depends/settings/CMakeLists.txt

@@ -9,28 +9,28 @@ include_directories(${Qt5Base_INCLUDE_DIRS})
 include(UseCXX11)
 include(Coverage)
 
-SET(LIBSETTINGS_SOURCES
+set(LIBSETTINGS_SOURCES
-libsettings_config.h
+	libsettings_config.h
 
-inifile.h
+	inifile.h
-inifile.cpp
+	inifile.cpp
 
-settingsobject.h
+	settingsobject.h
-settingsobject.cpp
+	settingsobject.cpp
-inisettingsobject.h
+	inisettingsobject.h
-inisettingsobject.cpp
+	inisettingsobject.cpp
 
-setting.h
+	setting.h
-setting.cpp
+	setting.cpp
-overridesetting.h
+	overridesetting.h
-overridesetting.cpp
+	overridesetting.cpp
 )
 
 # Set the include dir path.
-SET(LIBSETTINGS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE)
+set(LIBSETTINGS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE)
 
 # Static link!
-ADD_DEFINITIONS(-DLIBSETTINGS_STATIC)
+add_definitions(-DLIBSETTINGS_STATIC)
 
 add_definitions(-DLIBSETTINGS_LIBRARY)
 

depends/util/CMakeLists.txt

@@ -8,37 +8,35 @@ find_package(Qt5Core REQUIRED)
 
 # Include Qt headers.
 include_directories(${Qt5Base_INCLUDE_DIRS})
-# include_directories(${Qt5Network_INCLUDE_DIRS})
 
-SET(LIBUTIL_SOURCES
+set(LIBUTIL_SOURCES
-include/libutil_config.h
+	include/libutil_config.h
 
-include/pathutils.h
+	include/pathutils.h
-src/pathutils.cpp
+	src/pathutils.cpp
 
-include/osutils.h
+	include/osutils.h
 
-include/userutils.h
+	include/userutils.h
-src/userutils.cpp
+	src/userutils.cpp
 
-include/cmdutils.h
+	include/cmdutils.h
-src/cmdutils.cpp
+	src/cmdutils.cpp
 
-include/modutils.h
+	include/modutils.h
-src/modutils.cpp
+	src/modutils.cpp
 )
 
 # Set the include dir path.
-SET(LIBUTIL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
+set(LIBUTIL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
 
 # Static link!
-ADD_DEFINITIONS(-DLIBUTIL_STATIC)
+add_definitions(-DLIBUTIL_STATIC)
 
 add_definitions(-DLIBUTIL_LIBRARY)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 add_library(libUtil STATIC ${LIBUTIL_SOURCES})
-# qt5_use_modules(libUtil Core Network)
 qt5_use_modules(libUtil Core)
 target_link_libraries(libUtil)

depends/xz-embedded/CMakeLists.txt

@@ -8,21 +8,21 @@ option(XZ_BUILD_MINIDEC "Build a tiny utility that decompresses xz streams" OFF)
 set(CMAKE_C_FLAGS "-std=c99")
 
 include_directories(include)
-SET(XZ_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
+set(XZ_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
 
 # See include/xz.h for manual feature configuration
 # tweak this list and xz.h to fit your needs
 
 set(XZ_SOURCES
-include/xz.h
+	include/xz.h
-src/xz_config.h
+	src/xz_config.h
-src/xz_crc32.c
+	src/xz_crc32.c
-src/xz_crc64.c
+	src/xz_crc64.c
-src/xz_dec_lzma2.c
+	src/xz_dec_lzma2.c
-src/xz_dec_stream.c
+	src/xz_dec_stream.c
-src/xz_lzma2.h
+	src/xz_lzma2.h
-src/xz_private.h
+	src/xz_private.h
-src/xz_stream.h
+	src/xz_stream.h
 #	src/xz_dec_bcj.c
 )
 # TODO: look into what would be needed for plain old lzma

install_prereqs.cmake.in

@@ -1,4 +1,4 @@
-FILE(GLOB_RECURSE	QTPLUGINS "${CMAKE_INSTALL_PREFIX}/@PLUGIN_DEST_DIR@/*@CMAKE_SHARED_LIBRARY_SUFFIX@")
+file(GLOB_RECURSE	QTPLUGINS "${CMAKE_INSTALL_PREFIX}/@PLUGIN_DEST_DIR@/*@CMAKE_SHARED_LIBRARY_SUFFIX@")
 function(gp_resolved_file_type_override resolved_file type_var)
 	if(resolved_file MATCHES "^/usr/lib/libQt")
 		message("resolving ${resolved_file} as other")

mmc_updater/CMakeLists.txt

@@ -6,11 +6,11 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
 include_directories(depends)
 
-if (WIN32)
+if(WIN32)
 	include_directories(depends/win32cpp)
 
 	# static all the things. The updater must have no dependencies,  or it will fail.
-	if (MINGW)
+	if(MINGW)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++ -static")
 #set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -static-libgcc -s")
@@ -34,7 +34,7 @@ else()
 	set(CMAKE_C_FLAGS_RELEASE "-Os")
 endif()
 
-if (APPLE)
+if(APPLE)
 	# Build the updater as a dual 32/64bit binary.  If only one architecture
 	# is required, removing the other architecture will reduce the size
 	# of the updater binary

mmc_updater/src/CMakeLists.txt

@@ -4,7 +4,7 @@ add_subdirectory(tests)
 find_package(Threads REQUIRED)
 include(GenerateCppResourceFile)
 
-set (UPDATER_SOURCES
+set(UPDATER_SOURCES
  AppInfo.cpp
  AppInfo.h
  DirIterator.cpp
@@ -28,14 +28,14 @@ set (UPDATER_SOURCES
 
 add_definitions(-DTIXML_USE_STL)
 
-if (WIN32)
+if(WIN32)
 	set(UPDATER_SOURCES ${UPDATER_SOURCES} UpdateDialogWin32.cpp UpdateDialogWin32.h)
 endif()
 
-if (UNIX)
+if(UNIX)
 	set(UPDATER_SOURCES ${UPDATER_SOURCES} UpdateDialogAscii.cpp UpdateDialogAscii.h)
 	add_definitions(-Wall -Wconversion)
-if (APPLE)
+	if(APPLE)
 		set(MAC_DOCK_ICON_CPP_FILE ${CMAKE_CURRENT_BINARY_DIR}/mac_dock_icon.cpp)
 		set(MAC_INFO_PLIST_FILE ${CMAKE_CURRENT_BINARY_DIR}/mac_info_plist.cpp)
 		generate_cpp_resource_file(resource_macdockicon ${CMAKE_CURRENT_SOURCE_DIR}/resources/mac.icns ${MAC_DOCK_ICON_CPP_FILE})
@@ -50,7 +50,7 @@ if (APPLE)
 		 mac_dock_icon.cpp
 		 mac_info_plist.cpp
 		)
-else() # linuxes and other similar systems
+	else() # linuxes and other similar systems
 		find_package(GTK2 REQUIRED gtk)
 		include_directories(${GTK2_INCLUDE_DIRS})
 		add_library(updatergtk SHARED UpdateDialogGtk.cpp UpdateDialogGtk.h)
@@ -65,18 +65,15 @@ else() # linuxes and other similar systems
 		add_dependencies(resource_updatergtk updatergtk)
 
 		set(UPDATER_SOURCES ${UPDATER_SOURCES} UpdateDialogGtkFactory.cpp UpdateDialogGtkFactory.h ${GTK_BIN_CPP_FILE})
-endif()
+	endif()
 endif()
 
 add_library(updatershared STATIC ${UPDATER_SOURCES})
 
-target_link_libraries(updatershared
+target_link_libraries(updatershared anyoption tinyxml)
-  anyoption
-  tinyxml
-)
 
-if (UNIX)
+if(UNIX)
-	if (APPLE)
+	if(APPLE)
 		find_library(COCOA_LIBRARY Cocoa)
 		find_library(SECURITY_LIBRARY Security)
 		target_link_libraries(updatershared ${SECURITY_LIBRARY} ${COCOA_LIBRARY})
@@ -86,36 +83,34 @@ if (UNIX)
 	target_link_libraries(updatershared pthread dl)
 endif()
 
-if (WIN32)
+if(WIN32)
 	set(EXE_FLAGS WIN32 resources/updater.rc)
 endif()
 
 add_executable(updater ${EXE_FLAGS} main.cpp)
 
-target_link_libraries(updater
+target_link_libraries(updater updatershared)
-  updatershared
-)
 
 
 #### Updater Executable ####
-IF(WIN32)
+if(WIN32)
-INSTALL(TARGETS updater 
+	install(TARGETS updater
 	 BUNDLE DESTINATION . COMPONENT Runtime
 	 LIBRARY DESTINATION . COMPONENT Runtime
 	 RUNTIME DESTINATION . COMPONENT Runtime
-)
+	)
-ENDIF()
+endif()
-IF(UNIX)
+if(UNIX)
-IF(APPLE)
+	if(APPLE)
-INSTALL(TARGETS updater 
+		install(TARGETS updater
 		 BUNDLE DESTINATION . COMPONENT Runtime
 		 RUNTIME DESTINATION MultiMC.app/Contents/MacOS COMPONENT Runtime
-)
+		)
-ELSE()
+	else()
-INSTALL(TARGETS updater 
+		install(TARGETS updater
 		 BUNDLE DESTINATION . COMPONENT Runtime
 		 RUNTIME DESTINATION bin COMPONENT Runtime
-)
+		)
-ENDIF()
+	endif()
-ENDIF()
+endif()
 

mmc_updater/src/tests/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/..")
 
-if (APPLE)
+if(APPLE)
 	set(HELPER_SHARED_SOURCES ../StlSymbolsLeopard.cpp)
 endif()
 
@@ -32,13 +32,13 @@ macro(ADD_UPDATER_TEST CLASS)
 	set(TEST_TARGET updater_${CLASS})
 	unset(srcs)
 	list(APPEND srcs ${CLASS}.cpp)
-	if (WIN32)
+	if(WIN32)
 		list(APPEND srcs ${CMAKE_CURRENT_SOURCE_DIR}/test.rc)
 	endif()
 	add_executable(${TEST_TARGET} ${srcs})
 	target_link_libraries(${TEST_TARGET} updatershared)
 	add_test(NAME ${TEST_TARGET} COMMAND ${TEST_TARGET})
-	if (APPLE)
+	if(APPLE)
 		set_target_properties(${TEST_TARGET} PROPERTIES LINK_FLAGS "-framework Security -framework Cocoa")
 	endif()
 endmacro()

tests/CMakeLists.txt

@@ -8,7 +8,7 @@ macro(add_unit_test name)
 	unset(srcs)
 	foreach(arg ${testname} ${ARGN})
 		list(APPEND srcs ${CMAKE_CURRENT_SOURCE_DIR}/${arg})
-	if (WIN32)
+	if(WIN32)
 		list(APPEND srcs ${CMAKE_CURRENT_SOURCE_DIR}/test.rc)
 	endif()
 	endforeach()

translations/CMakeLists.txt

@@ -9,8 +9,8 @@ qt5_add_translation(TRANSLATION_QM ${TRANSLATION_FILES})
 add_custom_target(translations_update DEPENDS ${TRANSLATION_MESSAGES})
 add_custom_target(translations DEPENDS ${TRANSLATION_QM})
 
-IF(APPLE AND UNIX) ## OSX
+if(APPLE AND UNIX) ## OSX
 	install(FILES ${TRANSLATION_QM} DESTINATION MultiMC.app/Contents/MacOS/translations)
-ELSE()
+else()
 	install(FILES ${TRANSLATION_QM} DESTINATION translations)
-ENDIF()
+endif()