diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-12-28 20:24:50 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-12-28 20:24:50 +0100 |
| commit | 09795a01ef859f072920de9df974d1b03b9ab9a4 (patch) | |
| tree | 4d05907fc37f1bd781e506f5e196f7435aeec0ab /CMakeLists.txt | |
| parent | 5b4163d8c76b03f0d31b09866aa4bd06b4d8d804 (diff) | |
New upstream version 4.2.4aupstream/4.2.4a
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 521f641..3db52bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,13 +6,11 @@ SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/app) # Setup high-level build options ... IF(UNIX AND NOT APPLE) SET(XTRKCAD_USE_GTK_DEFAULT ON) - SET(XTRKCAD_USE_GTK_CAIRO_DEFAULT ON) SET(XTRKCAD_USE_GETTEXT_DEFAULT ON) ENDIF(UNIX AND NOT APPLE) IF(APPLE) SET(XTRKCAD_USE_GTK_DEFAULT ON) - SET(XTRKCAD_USE_GTK_CAIRO_DEFAULT ON) SET(XTRKCAD_USE_GETTEXT_DEFAULT OFF) ENDIF(APPLE) @@ -20,7 +18,6 @@ IF(WIN32) CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR) SET(XTRKCAD_USE_GTK_DEFAULT OFF) - SET(XTRKCAD_USE_GTK_CAIRO_DEFAULT OFF) SET(XTRKCAD_USE_GETTEXT_DEFAULT OFF) SET(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1" CACHE STRING "Flags used by the compiler during debug builds" FORCE) @@ -40,11 +37,8 @@ if(COMMAND cmake_policy) endif(COMMAND cmake_policy) SET(XTRKCAD_USE_DOXYGEN_DEFAULT OFF) -SET(XTRKCAD_USE_LAYOUTCONTROL_DEFAULT OFF) OPTION(XTRKCAD_USE_GTK "Use GTK for the graphical user interface back-end" ${XTRKCAD_USE_GTK_DEFAULT}) -OPTION(XTRKCAD_USE_GTK_CAIRO "Use Cairo for high-quality antialiased rendering" ${XTRKCAD_USE_GTK_CAIRO_DEFAULT}) OPTION(XTRKCAD_USE_GETTEXT "Use gettext for internationalization" ${XTRKCAD_USE_GETTEXT_DEFAULT}) -OPTION(XTRKCAD_USE_LAYOUTCONTROL "Include layout control commands" ${XTRKCAD_USE_LAYOUTCONTROL_DEFAULT}) OPTION(XTRKCAD_USE_DOXYGEN "Generate internals documentation using doxygen" ${XTRKCAD_USE_DOXYGEN_DEFAULT}) IF(APPLE) @@ -85,8 +79,8 @@ CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H) # Setup some global options for installation ... SET(XTRKCAD_MAJOR_VERSION "4") SET(XTRKCAD_MINOR_VERSION "2") -SET(XTRKCAD_RELEASE_VERSION "2") -SET(XTRKCAD_VERSION_MODIFIER "") +SET(XTRKCAD_RELEASE_VERSION "4") +SET(XTRKCAD_VERSION_MODIFIER "a") SET(XTRKCAD_VERSION "${XTRKCAD_MAJOR_VERSION}.${XTRKCAD_MINOR_VERSION}.${XTRKCAD_RELEASE_VERSION}${XTRKCAD_VERSION_MODIFIER}") IF(WIN32) |