diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a3a327..a21a982 100644 --- 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 index 9b6d27e..31dea3b 100644 --- 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 index 0b9f31c..40a3c75 100755 --- 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 index 14c9149..11a2e10 100755 --- 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 index ebc53ea..1a5f11d 100644 --- 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)