diff options
| author | Petr Mrázek <peterix@gmail.com> | 2018-01-27 23:53:10 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2018-01-27 23:53:10 +0100 |
| commit | 3277b820a7ba04560ce846c835378962e9052573 (patch) | |
| tree | 61cf6ccf5f95425e45ea275268fcf81a315eac06 /CMakeLists.txt | |
| parent | d66ae206dd94c0911333f29752438ebd5fd1ee50 (diff) | |
| download | MultiMC-3277b820a7ba04560ce846c835378962e9052573.tar MultiMC-3277b820a7ba04560ce846c835378962e9052573.tar.gz MultiMC-3277b820a7ba04560ce846c835378962e9052573.tar.lz MultiMC-3277b820a7ba04560ce846c835378962e9052573.tar.xz MultiMC-3277b820a7ba04560ce846c835378962e9052573.zip | |
NOISSUE fix the macOS bundle utilities problem
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index db208b22..cc5ef0b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,6 +78,29 @@ set(MultiMC_RELEASE_VERSION_NAME "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MIN #### Custom target to just print the version. add_custom_target(version echo "Version: ${MultiMC_RELEASE_VERSION_NAME}") +################################ 3rd Party Libs ################################ + +# Find the required Qt parts +find_package(Qt5Core REQUIRED) +find_package(Qt5Widgets REQUIRED) +find_package(Qt5Concurrent REQUIRED) +find_package(Qt5Network REQUIRED) +find_package(Qt5Test REQUIRED) +find_package(Qt5Xml REQUIRED) + +# The Qt5 cmake files don't provide its install paths, so ask qmake. +include(QMakeQuery) +query_qmake(QT_INSTALL_PLUGINS QT_PLUGINS_DIR) +query_qmake(QT_INSTALL_IMPORTS QT_IMPORTS_DIR) +query_qmake(QT_INSTALL_LIBS QT_LIBS_DIR) +query_qmake(QT_INSTALL_LIBEXECS QT_LIBEXECS_DIR) +query_qmake(QT_HOST_DATA QT_DATA_DIR) +set(QT_MKSPECS_DIR ${QT_DATA_DIR}/mkspecs) + +if (Qt5_POSITION_INDEPENDENT_CODE) + SET(CMAKE_POSITION_INDEPENDENT_CODE ON) +endif() + ####################################### Install layout ####################################### # How to install the build results @@ -205,30 +228,6 @@ else() message(FATAL_ERROR "No sensible install layout set.") endif() - -################################ 3rd Party Libs ################################ - -# Find the required Qt parts -find_package(Qt5Core REQUIRED) -find_package(Qt5Widgets REQUIRED) -find_package(Qt5Concurrent REQUIRED) -find_package(Qt5Network REQUIRED) -find_package(Qt5Test REQUIRED) -find_package(Qt5Xml REQUIRED) - -# The Qt5 cmake files don't provide its install paths, so ask qmake. -include(QMakeQuery) -query_qmake(QT_INSTALL_PLUGINS QT_PLUGINS_DIR) -query_qmake(QT_INSTALL_IMPORTS QT_IMPORTS_DIR) -query_qmake(QT_INSTALL_LIBS QT_LIBS_DIR) -query_qmake(QT_INSTALL_LIBEXECS QT_LIBEXECS_DIR) -query_qmake(QT_HOST_DATA QT_DATA_DIR) -set(QT_MKSPECS_DIR ${QT_DATA_DIR}/mkspecs) - -if (Qt5_POSITION_INDEPENDENT_CODE) - SET(CMAKE_POSITION_INDEPENDENT_CODE ON) -endif() - ################################ Included Libs ################################ include(ExternalProject) |