Skip to content
This repository has been archived by the owner on Aug 5, 2022. It is now read-only.

Commit

Permalink
Merge pull request #349 from dawagner/vs2015-require-cmake-v3.3.0
Browse files Browse the repository at this point in the history
CMake/Windows: Require CMake 3.3.0
  • Loading branch information
krocard committed Feb 4, 2016
2 parents 8ca3cad + cf70070 commit 58f1451
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# working on 2.8.12 - broken on older versions
# working on 2.8.12 - broken on older versions.
# Visual Studio 14 needs 3.3.0; see https://cmake.org/Bug/print_bug_page.php?bug_id=15552
cmake_minimum_required(VERSION 2.8.12)
if(CMAKE_GENERATOR STRGREATER "Visual Studio 14 2015")
cmake_minimum_required(VERSION 3.3.0)
endif()

project(parameter-framework)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ sections:

In order to compile you'll need, at the very least:

- CMake (v2.8.12 or later);
- CMake (v2.8.12 or later) (v3.3.0 or later on Windows);
- A C/C++ compiler supporting C++11;
- libxml2 headers and libraries (Provided by the `libxml2-dev` on debian-based
distributions);
Expand Down

0 comments on commit 58f1451

Please sign in to comment.