diff options
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/classparser/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | depends/javacheck/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | depends/launcher/CMakeLists.txt | 40 | ||||
| -rw-r--r-- | depends/pack200/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | depends/quazip/CMakeLists.txt | 33 | ||||
| -rw-r--r-- | depends/settings/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | depends/util/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | depends/xz-embedded/CMakeLists.txt | 20 |
8 files changed, 92 insertions, 105 deletions
diff --git a/depends/classparser/CMakeLists.txt b/depends/classparser/CMakeLists.txt index 5a48e002..abae3ef5 100644 --- a/depends/classparser/CMakeLists.txt +++ b/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) diff --git a/depends/javacheck/CMakeLists.txt b/depends/javacheck/CMakeLists.txt index 10b9a716..8396aabb 100644 --- a/depends/javacheck/CMakeLists.txt +++ b/depends/javacheck/CMakeLists.txt @@ -7,9 +7,9 @@ set(CMAKE_JAVA_JAR_ENTRY_POINT JavaCheck) set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked) set(SRC - JavaCheck.java + JavaCheck.java ) add_jar(JavaCheck ${SRC}) -INSTALL_JAR(JavaCheck "${BINARY_DEST_DIR}/jars") +install_jar(JavaCheck "${BINARY_DEST_DIR}/jars") diff --git a/depends/launcher/CMakeLists.txt b/depends/launcher/CMakeLists.txt index 6af5f738..9db3aaeb 100644 --- a/depends/launcher/CMakeLists.txt +++ b/depends/launcher/CMakeLists.txt @@ -7,29 +7,29 @@ set(CMAKE_JAVA_JAR_ENTRY_POINT org.multimc.EntryPoint) set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked) set(SRC - # OSX things - org/simplericity/macify/eawt/Application.java - org/simplericity/macify/eawt/ApplicationAdapter.java - org/simplericity/macify/eawt/ApplicationEvent.java - org/simplericity/macify/eawt/ApplicationListener.java - org/simplericity/macify/eawt/DefaultApplication.java + # OSX things + org/simplericity/macify/eawt/Application.java + org/simplericity/macify/eawt/ApplicationAdapter.java + org/simplericity/macify/eawt/ApplicationEvent.java + org/simplericity/macify/eawt/ApplicationListener.java + org/simplericity/macify/eawt/DefaultApplication.java - # legacy applet wrapper thing. - # The launcher has to be there for silly FML/Forge relauncher. - net/minecraft/Launcher.java - org/multimc/legacy/LegacyLauncher.java - org/multimc/legacy/LegacyFrame.java + # legacy applet wrapper thing. + # The launcher has to be there for silly FML/Forge relauncher. + net/minecraft/Launcher.java + org/multimc/legacy/LegacyLauncher.java + org/multimc/legacy/LegacyFrame.java - # onesix launcher - org/multimc/onesix/OneSixLauncher.java + # onesix launcher + org/multimc/onesix/OneSixLauncher.java - # generic launcher - org/multimc/EntryPoint.java - org/multimc/Launcher.java - org/multimc/ParseException.java - org/multimc/Utils.java - org/multimc/IconLoader.java + # generic launcher + org/multimc/EntryPoint.java + org/multimc/Launcher.java + org/multimc/ParseException.java + org/multimc/Utils.java + org/multimc/IconLoader.java ) add_jar(NewLaunch ${SRC}) -INSTALL_JAR(NewLaunch "${BINARY_DEST_DIR}/jars") +install_jar(NewLaunch "${BINARY_DEST_DIR}/jars") diff --git a/depends/pack200/CMakeLists.txt b/depends/pack200/CMakeLists.txt index 386c8bb8..f1b699b2 100644 --- a/depends/pack200/CMakeLists.txt +++ b/depends/pack200/CMakeLists.txt @@ -1,26 +1,26 @@ -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) - 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_LIBRARIES "") - IF(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h") - MESSAGE("Please specify a valid zlib include dir") - ENDIF(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h") -ENDIF(UNIX) - -SET(PACK200_SRC +else(UNIX) + 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_LIBRARIES "") + if(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h") + message("Please specify a valid zlib include dir") + endif(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h") +endif(UNIX) + +set(PACK200_SRC include/unpack200.h src/bands.cpp src/bands.h @@ -41,19 +41,19 @@ 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) -ENDIF() + qt5_use_modules(unpack200 Core) +endif() add_executable(anti200 anti200.cpp) target_link_libraries(anti200 unpack200) diff --git a/depends/quazip/CMakeLists.txt b/depends/quazip/CMakeLists.txt index 76da0a59..b5787307 100644 --- a/depends/quazip/CMakeLists.txt +++ b/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) - 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_LIBRARIES "") - IF(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h") - MESSAGE("Please specify a valid zlib include dir") - ENDIF(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h") -ENDIF(UNIX) +else(UNIX) + 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_LIBRARIES "") + if(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h") + message("Please specify a valid zlib include dir") + endif(NOT EXISTS "${ZLIB_INCLUDE_DIRS}/zlib.h") +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) - -#qt5_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) -#set(SRCS ${SRCS} ${MOC_SRCS}) - -#set(CMAKE_POSITION_INDEPENDENT_CODE ON) +add_definitions(-DQUAZIP_STATIC) 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}) diff --git a/depends/settings/CMakeLists.txt b/depends/settings/CMakeLists.txt index da853a73..868b31e6 100644 --- a/depends/settings/CMakeLists.txt +++ b/depends/settings/CMakeLists.txt @@ -7,28 +7,28 @@ find_package(Qt5Core REQUIRED) include_directories(${Qt5Base_INCLUDE_DIRS}) -SET(LIBSETTINGS_SOURCES -libsettings_config.h +set(LIBSETTINGS_SOURCES + libsettings_config.h -inifile.h -inifile.cpp + inifile.h + inifile.cpp -settingsobject.h -settingsobject.cpp -inisettingsobject.h -inisettingsobject.cpp + settingsobject.h + settingsobject.cpp + inisettingsobject.h + inisettingsobject.cpp -setting.h -setting.cpp -overridesetting.h -overridesetting.cpp + setting.h + setting.cpp + overridesetting.h + 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) diff --git a/depends/util/CMakeLists.txt b/depends/util/CMakeLists.txt index 7f6573bd..969c4a78 100644 --- a/depends/util/CMakeLists.txt +++ b/depends/util/CMakeLists.txt @@ -20,31 +20,30 @@ find_package(Qt5Core REQUIRED) # Include Qt headers. include_directories(${Qt5Base_INCLUDE_DIRS}) -# include_directories(${Qt5Network_INCLUDE_DIRS}) -SET(LIBUTIL_SOURCES -include/libutil_config.h +set(LIBUTIL_SOURCES + include/libutil_config.h -include/pathutils.h -src/pathutils.cpp + include/pathutils.h + src/pathutils.cpp -include/osutils.h + include/osutils.h -include/userutils.h -src/userutils.cpp + include/userutils.h + src/userutils.cpp -include/cmdutils.h -src/cmdutils.cpp + include/cmdutils.h + src/cmdutils.cpp -include/modutils.h -src/modutils.cpp + include/modutils.h + 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) @@ -59,6 +58,5 @@ IF(MultiMC_CODE_COVERAGE) ENDIF(MultiMC_CODE_COVERAGE) add_library(libUtil STATIC ${LIBUTIL_SOURCES}) -# qt5_use_modules(libUtil Core Network) qt5_use_modules(libUtil Core) target_link_libraries(libUtil) diff --git a/depends/xz-embedded/CMakeLists.txt b/depends/xz-embedded/CMakeLists.txt index d4987f76..b308efa4 100644 --- a/depends/xz-embedded/CMakeLists.txt +++ b/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 -src/xz_config.h -src/xz_crc32.c -src/xz_crc64.c -src/xz_dec_lzma2.c -src/xz_dec_stream.c -src/xz_lzma2.h -src/xz_private.h -src/xz_stream.h + include/xz.h + src/xz_config.h + src/xz_crc32.c + src/xz_crc64.c + src/xz_dec_lzma2.c + src/xz_dec_stream.c + src/xz_lzma2.h + src/xz_private.h + src/xz_stream.h # src/xz_dec_bcj.c ) # TODO: look into what would be needed for plain old lzma |