New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CMake 2 support #4530

Merged
merged 1 commit into from Aug 7, 2018

Conversation

Projects
None yet
1 participant
@tresf
Member

tresf commented Aug 7, 2018

Partially reverts d599955 and fixes CMake 2 support when building with MingGW. Originally reported by @Umcaruje on #programming channel on Discord, CMake 3 git blame discovered by @PhysSong.

This patch does not need to be fast-forwarded to master branch because master requires CMake 3 already although it should be at least hand-patched because d599955 was accidentally reverted at some point.

Ubuntu 14.04 still defaults to CMake 2 by default (e.g. apt-get install cmake), so this can help avoid unobvious dependency issues.

Before:

-- Found PkgConfig: /usr/bin/pkg-config (found version "0.26")

After:

-- Found PkgConfig: /opt/mingw64/bin/x86_64-w64-mingw32-pkg-config (found version "0.26")

Keywords:

-- checking for module 'sndfile>=1.0.11'
--   package 'sndfile>=1.0.11' not found
CMake Error at /usr/share/cmake-2.8/Modules/FindPkgConfig.cmake:283 (message):
  A required package was not found
Call Stack (most recent call first):
  /usr/share/cmake-2.8/Modules/FindPkgConfig.cmake:337 (_pkg_check_modules_internal)
  CMakeLists.txt:189 (PKG_CHECK_MODULES)


CMake Error at CMakeLists.txt:191 (MESSAGE):
  LMMS requires libsndfile1 and libsndfile1-dev >= 1.0.11 - please install,
  remove CMakeCache.txt and try again!
Add CMake 2 support
Partially reverts d599955
@tresf

This comment has been minimized.

Show comment
Hide comment
@tresf

tresf Aug 7, 2018

Member

Note, until this PR is merged, the documentation temporarily states that cmake3 is required. That note should be removed once merged. Edit: Removed cmake3 note from documentation.

Member

tresf commented Aug 7, 2018

Note, until this PR is merged, the documentation temporarily states that cmake3 is required. That note should be removed once merged. Edit: Removed cmake3 note from documentation.

@tresf tresf merged commit 2ecc8bb into LMMS:stable-1.2 Aug 7, 2018

2 checks passed

ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@tresf tresf deleted the tresf:cmake2 branch Aug 7, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment