diff options
| -rw-r--r-- | CMakeLists.txt | 18 | ||||
| -rw-r--r-- | application/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | depends/classparser/CMakeLists.txt | 7 |
3 files changed, 15 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 53de9aa0..4633b4da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,24 +66,6 @@ query_qmake(QT_INSTALL_LIBEXECS QT_LIBEXECS_DIR) query_qmake(QT_HOST_DATA QT_DATA_DIR) set(QT_MKSPECS_DIR ${QT_DATA_DIR}/mkspecs) - -################################ SET UP BUILD OPTIONS ################################ - -######## Check endianness ######## -include(TestBigEndian) -test_big_endian(BIGENDIAN) -if(${BIGENDIAN}) - add_definitions(-DMULTIMC_BIG_ENDIAN) -endif(${BIGENDIAN}) - -#### Custom target to just print the version. -add_custom_target(version echo "Version: ${MultiMC_VERSION_STRING}") - -#### Check the current Git commit -include(GitFunctions) -git_run(COMMAND rev-parse HEAD DEFAULT "Unknown" OUTPUT_VAR MultiMC_GIT_COMMIT) -message(STATUS "Git commit: ${MultiMC_GIT_COMMIT}") - ################################ Included Libs ################################ include(ExternalProject) diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index 58a90efa..9e94cdad 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -29,6 +29,11 @@ set(MultiMC_UPDATER false CACHE BOOL "Whether or not the update system is enable # Notification URL set(MultiMC_NOTIFICATION_URL "" CACHE STRING "URL for checking for notifications.") +#### Check the current Git commit +include(GitFunctions) +git_run(COMMAND rev-parse HEAD DEFAULT "Unknown" OUTPUT_VAR MultiMC_GIT_COMMIT) +message(STATUS "Git commit: ${MultiMC_GIT_COMMIT}") + set(MultiMC_RELEASE_VERSION_NAME "${MultiMC_VERSION_MAJOR}.${MultiMC_VERSION_MINOR}") if(MultiMC_VERSION_HOTFIX GREATER 0) set(MultiMC_RELEASE_VERSION_NAME "${MultiMC_RELEASE_VERSION_NAME}.${MultiMC_VERSION_HOTFIX}") @@ -50,6 +55,9 @@ endif() message(STATUS "MultiMC 5 Version: ${MultiMC_VERSION_STRING}") +#### Custom target to just print the version. +add_custom_target(version echo "Version: ${MultiMC_VERSION_STRING}") + # If the update system is enabled, make sure MultiMC_CHANLIST_URL and MultiMC_VERSION_CHANNEL are set. if(MultiMC_UPDATER) if(MultiMC_VERSION_CHANNEL STREQUAL "") diff --git a/depends/classparser/CMakeLists.txt b/depends/classparser/CMakeLists.txt index abae3ef5..68ae7b73 100644 --- a/depends/classparser/CMakeLists.txt +++ b/depends/classparser/CMakeLists.txt @@ -2,6 +2,13 @@ project(classparser) set(CMAKE_AUTOMOC ON) +######## Check endianness ######## +include(TestBigEndian) +test_big_endian(BIGENDIAN) +if(${BIGENDIAN}) + add_definitions(-DMULTIMC_BIG_ENDIAN) +endif(${BIGENDIAN}) + # Find Qt find_package(Qt5Core REQUIRED) |