blob: be0913de4a37ad10de6e5e19c2264e72b55c1a01 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From c215d5ecd985b57700e817920d0e99112b4a571b Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 25 Jan 2015 13:35:24 +0100
Subject: [PATCH] cmake: do not check for g++ when FTDIPP is disabled
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
CMakeLists.txt | 6 ++++--
ftdipp/CMakeLists.txt | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ba0b08..e880211 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
# Project
-project(libftdi1)
+project(libftdi1 C)
set(MAJOR_VERSION 1)
set(MINOR_VERSION 2)
set(PACKAGE libftdi1)
@@ -145,7 +145,9 @@ else(DOCUMENTATION AND DOXYGEN_FOUND)
endif(DOCUMENTATION AND DOXYGEN_FOUND)
add_subdirectory(src)
-add_subdirectory(ftdipp)
+if(FTDIPP)
+ add_subdirectory(ftdipp)
+endif()
add_subdirectory(python)
add_subdirectory(ftdi_eeprom)
add_subdirectory(examples)
diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt
index 27e7884..2d080f4 100644
--- a/ftdipp/CMakeLists.txt
+++ b/ftdipp/CMakeLists.txt
@@ -1,4 +1,5 @@
# Check
+project(libftdipp1 C CXX)
set(FTDI_BUILD_CPP False PARENT_SCOPE)
option ( FTDIPP "Build C++ binding library libftdi1++" ON )
--
2.2.2
|
