diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-10 23:05:17 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-07-10 23:05:17 +0200 |
| commit | c120c7bcbcf115ecc2a6668f4c7f45b3d4a5bc86 (patch) | |
| tree | 5550610553d1b1d7236d052b6e956b22e0bb4883 /CMakeLists.txt | |
| parent | 67d0ce65dc6a1d240e271a7cd479b60aa1dc2967 (diff) | |
| parent | 26d299964db18cb71c2c6a5be4864479ba82d54f (diff) | |
Merge branch 'release/debian/5.1.1-1'debian/5.1.1-1
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ec8908..a754bd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ PROJECT(XTrkCAD) enable_testing() -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 2.8) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked @@ -14,15 +14,15 @@ if(UNIX) if(APPLE) SET(XTRKCAD_USE_GETTEXT_DEFAULT OFF) else() - set(XTRKCAD_USE_GETTEXT_DEFAULT ON) - add_compile_options("-std=gnu99") + set(XTRKCAD_USE_GETTEXT_DEFAULT ON) + add_compile_options("-std=gnu99") PKG_CHECK_MODULES(GTK_WEBKIT "webkit-1.0") - if(GTK_WEBKIT_FOUND) + if(GTK_WEBKIT_FOUND) set(XTRKCAD_USE_BROWSER_DEFAULT OFF) else() - set(XTRKCAD_USE_BROWSER_DEFAULT ON) + set(XTRKCAD_USE_BROWSER_DEFAULT ON) endif() - endif(APPLE) + endif(APPLE) endif(UNIX) IF(WIN32) @@ -33,7 +33,7 @@ IF(WIN32) SET(CMAKE_C_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG" CACHE STRING "Flags used by the compiler during release minumum size builds" FORCE) SET(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ob2 /D NDEBUG" CACHE STRING "Flags used by the compiler during release builds" FORCE) SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG" CACHE STRING "Flags used by the compiler during release with debug info builds" FORCE) - + ADD_DEFINITIONS(-DWINDOWS) ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ENDIF(WIN32) @@ -42,7 +42,7 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) if( POLICY CMP0026 ) cmake_policy(SET CMP0026 OLD) - endif( POLICY CMP0026 ) + endif( POLICY CMP0026 ) endif(COMMAND cmake_policy) SET(XTRKCAD_USE_DOXYGEN_DEFAULT OFF) @@ -101,7 +101,7 @@ CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H) # Setup some global options for installation ... SET(XTRKCAD_MAJOR_VERSION "5") SET(XTRKCAD_MINOR_VERSION "1") -SET(XTRKCAD_RELEASE_VERSION "0") +SET(XTRKCAD_RELEASE_VERSION "1") SET(XTRKCAD_VERSION_MODIFIER "") SET(XTRKCAD_VERSION "${XTRKCAD_MAJOR_VERSION}.${XTRKCAD_MINOR_VERSION}.${XTRKCAD_RELEASE_VERSION}${XTRKCAD_VERSION_MODIFIER}") @@ -127,14 +127,14 @@ IF(XTRKCAD_USE_GETTEXT) # use supplied gettext library for Visual Studio message( STATUS "Use simple_gettext module included with XTrackCAD" ) ADD_DEFINITIONS(-DUSE_SIMPLE_GETTEXT ) - else() + else() # for mingw & co. find libintl.h and use it find_path ( INTL_PATH libintl.h ) if(INTL_PATH) - message( STATUS "Use installed gettext module" ) + message( STATUS "Use installed gettext module" ) INCLUDE_DIRECTORIES(${INTL_PATH}) - endif(INTL_PATH) - endif() + endif(INTL_PATH) + endif() ENDIF(WIN32) ELSE(XTRKCAD_USE_GETTEXT) SET(GENHELP_OPTS "-bh") @@ -144,4 +144,3 @@ ENDIF(XTRKCAD_USE_GETTEXT) ADD_SUBDIRECTORY(app) ADD_SUBDIRECTORY(distribution) ADD_SUBDIRECTORY(docs) - |