Skip to content

Commit

Permalink
add cmake_minimum_required to top of CMakeLists.txt and increase mini…
Browse files Browse the repository at this point in the history
…mum Version
  • Loading branch information
looooo authored and wwmayer committed Mar 7, 2019
1 parent 3ad9ee6 commit 9e86ff4
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
@@ -1,3 +1,4 @@
cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
project(FreeCAD_trunk)

set(PACKAGE_NAME "FreeCAD")
Expand All @@ -10,8 +11,6 @@ set(FREECAD_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}")
set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")

cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)

if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
if(POLICY CMP0020)
Expand Down

2 comments on commit 9e86ff4

@sgrogan
Copy link
Contributor

@sgrogan sgrogan commented on 9e86ff4 Mar 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks the PPA 14.04 builds, which I think will break the PPA based AppImages.
I'll see if I can make the PPA use a newer cmake, 14.04 is going to reach EOL soon, so this was coming anyway.

@sgrogan
Copy link
Contributor

@sgrogan sgrogan commented on 9e86ff4 Mar 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a cmake3 package available for 14.04 from the official repo that provides 3.5.1. This fixes the 14.04 PPA builds. Next merge to master will see if this breaks 16.04 https://git.launchpad.net/~freecad-maintainers/+git/gitpackaging/commit/?h=dailybuild-occt&id=33337f2e9901f00f79b5e084bb4e16ac327ddc57

Please sign in to comment.