tools: remove INSTALLGPIOTOOL flag
This commit removes INSTALLGPIOTOOL flag as it is not required anymore Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
committed by
Brendan Le Foll
parent
ec26f92fe6
commit
02963b791a
@@ -137,7 +137,6 @@ option (FTDI4222 "Build with FTDI FT4222 subplatform support." OFF)
|
|||||||
option (IPK "Generate IPK using CPack" OFF)
|
option (IPK "Generate IPK using CPack" OFF)
|
||||||
option (RPM "Generate RPM using CPack" OFF)
|
option (RPM "Generate RPM using CPack" OFF)
|
||||||
option (ENABLEEXAMPLES "Disable building of examples" ON)
|
option (ENABLEEXAMPLES "Disable building of examples" ON)
|
||||||
option (INSTALLGPIOTOOL "Install gpio tool" OFF)
|
|
||||||
option (INSTALLTOOLS "Install all tools" ON)
|
option (INSTALLTOOLS "Install all tools" ON)
|
||||||
option (BUILDTESTS "Override the addition of tests" ON)
|
option (BUILDTESTS "Override the addition of tests" ON)
|
||||||
option (USEPYTHON3TESTS "Force tests to run with python3" OFF)
|
option (USEPYTHON3TESTS "Force tests to run with python3" OFF)
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ services:
|
|||||||
- IPK=${IPK:-OFF}
|
- IPK=${IPK:-OFF}
|
||||||
- RPM=${RPM:-OFF}
|
- RPM=${RPM:-OFF}
|
||||||
- ENABLEEXAMPLES=${ENABLEEXAMPLES:-OFF}
|
- ENABLEEXAMPLES=${ENABLEEXAMPLES:-OFF}
|
||||||
- INSTALLGPIOTOOL=${INSTALLGPIOTOOL:-OFF}
|
|
||||||
- INSTALLTOOLS=${INSTALLTOOLS:-ON}
|
- INSTALLTOOLS=${INSTALLTOOLS:-ON}
|
||||||
- CC=${CC:-clang-3.8}
|
- CC=${CC:-clang-3.8}
|
||||||
- CXX=${CXX:-clang++-3.8}
|
- CXX=${CXX:-clang++-3.8}
|
||||||
|
|||||||
@@ -75,7 +75,6 @@ cmake \
|
|||||||
-DIPK=$IPK \
|
-DIPK=$IPK \
|
||||||
-DRPM=$RPM \
|
-DRPM=$RPM \
|
||||||
-DENABLEEXAMPLES=$ENABLEEXAMPLES \
|
-DENABLEEXAMPLES=$ENABLEEXAMPLES \
|
||||||
-DINSTALLGPIOTOOL=$INSTALLGPIOTOOL \
|
|
||||||
-DINSTALLTOOLS=$INSTALLTOOLS \
|
-DINSTALLTOOLS=$INSTALLTOOLS \
|
||||||
-DBUILDTESTS=$BUILDTESTS \
|
-DBUILDTESTS=$BUILDTESTS \
|
||||||
-DUSEPYTHON3TESTS=$USEPYTHON3TESTS \
|
-DUSEPYTHON3TESTS=$USEPYTHON3TESTS \
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ cmake \
|
|||||||
-DIPK=$IPK \
|
-DIPK=$IPK \
|
||||||
-DRPM=$RPM \
|
-DRPM=$RPM \
|
||||||
-DENABLEEXAMPLES=$ENABLEEXAMPLES \
|
-DENABLEEXAMPLES=$ENABLEEXAMPLES \
|
||||||
-DINSTALLGPIOTOOL=$INSTALLGPIOTOOL \
|
|
||||||
-DINSTALLTOOLS=$INSTALLTOOLS \
|
-DINSTALLTOOLS=$INSTALLTOOLS \
|
||||||
-DBUILDTESTS=$BUILDTESTS \
|
-DBUILDTESTS=$BUILDTESTS \
|
||||||
-DUSEPYTHON3TESTS=$USEPYTHON3TESTS \
|
-DUSEPYTHON3TESTS=$USEPYTHON3TESTS \
|
||||||
|
|||||||
@@ -11,10 +11,6 @@ target_link_libraries (mraa-gpio mraa)
|
|||||||
target_link_libraries (mraa-i2c mraa)
|
target_link_libraries (mraa-i2c mraa)
|
||||||
target_link_libraries (mraa-uart mraa)
|
target_link_libraries (mraa-uart mraa)
|
||||||
|
|
||||||
if (INSTALLGPIOTOOL AND NOT INSTALLTOOLS)
|
|
||||||
install (TARGETS mraa-gpio DESTINATION bin)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (INSTALLTOOLS)
|
if (INSTALLTOOLS)
|
||||||
install (TARGETS mraa-gpio DESTINATION bin)
|
install (TARGETS mraa-gpio DESTINATION bin)
|
||||||
install (TARGETS mraa-i2c DESTINATION bin)
|
install (TARGETS mraa-i2c DESTINATION bin)
|
||||||
|
|||||||
Reference in New Issue
Block a user