pylint may be available as pylint3 or pylint

[nominatim.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c3730e33f958f76ea48926ae73a1c9726045fc2..761531b10218ea5e7feda79c884de2841fc143bd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@ endif()
 #-----------------------------------------------------------------------------
 
 if (BUILD_IMPORTER)
 #-----------------------------------------------------------------------------
 
 if (BUILD_IMPORTER)

-    find_package(PythonInterp 3)
+    find_package(PythonInterp 3.5 REQUIRED)

 
     find_program(PYOSMIUM pyosmium-get-changes)
     if (NOT EXISTS "${PYOSMIUM}")
 
     find_program(PYOSMIUM pyosmium-get-changes)
     if (NOT EXISTS "${PYOSMIUM}")


@@ -98,7 +98,6 @@ if (BUILD_IMPORTER)
    set(CUSTOMSCRIPTS
        check_import_finished.php
        country_languages.php
    set(CUSTOMSCRIPTS
        check_import_finished.php
        country_languages.php

-       importWikipedia.php

        export.php
        query.php
        setup.php
        export.php
        query.php
        setup.php


@@ -112,17 +111,8 @@ if (BUILD_IMPORTER)
                       ${PROJECT_BINARY_DIR}/utils/${script_source})
    endforeach()
 
                       ${PROJECT_BINARY_DIR}/utils/${script_source})
    endforeach()
 

-   set(NOMINATIM_TOOLS
-       setup
-       update
-       admin
-       query
-      )
-
-   foreach (tool_name ${NOMINATIM_TOOLS})
-       configure_file(${PROJECT_SOURCE_DIR}/cmake/tool.tmpl
-                      ${PROJECT_BINARY_DIR}/nominatim-${tool_name})
-   endforeach()
+   configure_file(${PROJECT_SOURCE_DIR}/cmake/tool.tmpl
+                  ${PROJECT_BINARY_DIR}/nominatim)

 endif()
 
 #-----------------------------------------------------------------------------
 endif()
 
 #-----------------------------------------------------------------------------


@@ -150,6 +140,8 @@ if (BUILD_TESTS)
 
     set(TEST_BDD db osm2pgsql api)
 
 
     set(TEST_BDD db osm2pgsql api)
 

+    find_program(PYLINT NAMES pylint3 pylint)
+

     foreach (test ${TEST_BDD})
         add_test(NAME bdd_${test}
                  COMMAND behave ${test}
     foreach (test ${TEST_BDD})
         add_test(NAME bdd_${test}
                  COMMAND behave ${test}


@@ -165,6 +157,15 @@ if (BUILD_TESTS)
     add_test(NAME phpcs
              COMMAND phpcs --report-width=120 --colors lib website utils
              WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
     add_test(NAME phpcs
              COMMAND phpcs --report-width=120 --colors lib website utils
              WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})

+
+    if (PYLINT)
+        message(STATUS "Using '${PYLINT}' for Python linting.")
+        add_test(NAME pylint
+                 COMMAND ${PYLINT} nominatim
+                 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
+    else()
+        message(STATUS "pylint not found. Linting tests disabled.")
+    endif()

 endif()
 
 #-----------------------------------------------------------------------------
 endif()
 
 #-----------------------------------------------------------------------------