tools: remove INSTALLGPIOTOOL flag

This commit removes INSTALLGPIOTOOL flag as it is not required anymore Signed-off-by: Manivannan Sadhasivam <[email protected]> Signed-off-by: Brendan Le Foll <[email protected]>
eclipse · Nov 2, 2017 · 02963b7 · 02963b7
1 parent ec26f92
commit 02963b7
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -137,7 +137,6 @@ option (FTDI4222 "Build with FTDI FT4222 subplatform support." OFF)
 option (IPK "Generate IPK using CPack" OFF)
 option (RPM "Generate RPM using CPack" OFF)
 option (ENABLEEXAMPLES "Disable building of examples" ON)
-option (INSTALLGPIOTOOL "Install gpio tool" OFF)
 option (INSTALLTOOLS "Install all tools" ON)
 option (BUILDTESTS "Override the addition of tests" ON)
 option (USEPYTHON3TESTS "Force tests to run with python3" OFF)

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -24,7 +24,6 @@ services:
       - IPK=${IPK:-OFF}
       - RPM=${RPM:-OFF}
       - ENABLEEXAMPLES=${ENABLEEXAMPLES:-OFF}
-      - INSTALLGPIOTOOL=${INSTALLGPIOTOOL:-OFF}
       - INSTALLTOOLS=${INSTALLTOOLS:-ON}
       - CC=${CC:-clang-3.8}
       - CXX=${CXX:-clang++-3.8}

diff --git a/scripts/build-android.sh b/scripts/build-android.sh
@@ -75,7 +75,6 @@ cmake \
   -DIPK=$IPK \
   -DRPM=$RPM \
   -DENABLEEXAMPLES=$ENABLEEXAMPLES \
-  -DINSTALLGPIOTOOL=$INSTALLGPIOTOOL \
   -DINSTALLTOOLS=$INSTALLTOOLS \
   -DBUILDTESTS=$BUILDTESTS \
   -DUSEPYTHON3TESTS=$USEPYTHON3TESTS \

diff --git a/scripts/run-cmake.sh b/scripts/run-cmake.sh
@@ -20,7 +20,6 @@ cmake \
   -DIPK=$IPK \
   -DRPM=$RPM \
   -DENABLEEXAMPLES=$ENABLEEXAMPLES \
-  -DINSTALLGPIOTOOL=$INSTALLGPIOTOOL \
   -DINSTALLTOOLS=$INSTALLTOOLS \
   -DBUILDTESTS=$BUILDTESTS \
   -DUSEPYTHON3TESTS=$USEPYTHON3TESTS \

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -11,10 +11,6 @@ target_link_libraries (mraa-gpio mraa)
 target_link_libraries (mraa-i2c mraa)
 target_link_libraries (mraa-uart mraa)
 
-if (INSTALLGPIOTOOL AND NOT INSTALLTOOLS)
-   install (TARGETS mraa-gpio DESTINATION bin)
-endif()
-
 if (INSTALLTOOLS)
   install (TARGETS mraa-gpio DESTINATION bin)
   install (TARGETS mraa-i2c DESTINATION bin)