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

Commit 58f1451

Browse files
committed
Merge pull request #349 from dawagner/vs2015-require-cmake-v3.3.0
CMake/Windows: Require CMake 3.3.0
2 parents 8ca3cad + cf70070 commit 58f1451

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@
2626
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2727
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828

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

3236
project(parameter-framework)
3337

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ sections:
7373

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

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

0 commit comments

Comments
 (0)