gplugin/gplugin

flow: Merged <feature> 'disable-testing' to <develop> ('develop').
develop
2014-06-05, Gary Kramlich
717f0458a8b5
Parents 028b331f0a7f1d49b45cda71
Children b6a19d546da0
flow: Merged 'disable-testing' to ('develop').
7 files changed, 33 insertions(+), 16 deletions(-)
  • +18 -10
    CMakeLists.txt
  • +3 -1
    gjs/CMakeLists.txt
  • +3 -1
    gplugin/CMakeLists.txt
  • +0 -1
    gplugin/tests/CMakeLists.txt
  • +3 -1
    lua/CMakeLists.txt
  • +3 -1
    python/CMakeLists.txt
  • +3 -1
    seed/CMakeLists.txt
    • --- a/CMakeLists.txt Sat May 24 15:59:57 2014 -0500
    +++ b/CMakeLists.txt Thu Jun 05 18:19:51 2014 -0500
    @@ -41,6 +41,12 @@
    "On"
    )
    +option(
    + TESTING_ENABLED
    + "Whether or not to run unit tests while compiling"
    + "On"
    +)
    +
    ###############################################################################
    # Dependencies
    ###############################################################################
    @@ -104,17 +110,19 @@
    pkg_config_variable(glib-2.0 glib_mkenums GLIB_MKENUMS)
    endif(${GLIB_gobject-2.0_VERSION} LESS 2.32.0)
    -find_program(GTESTER
    - NAMES gtester
    - DOC "gtester executable"
    -)
    -mark_as_advanced(GTESTER)
    +if(TESTING_ENABLED)
    + find_program(GTESTER
    + NAMES gtester
    + DOC "gtester executable"
    + )
    + mark_as_advanced(GTESTER)
    -find_program(XSLTPROC
    - NAMES xsltproc
    - DOC "xsltproc executable"
    -)
    -mark_as_advanced(XSLTPROC)
    + find_program(XSLTPROC
    + NAMES xsltproc
    + DOC "xsltproc executable"
    + )
    + mark_as_advanced(XSLTPROC)
    +endif(TESTING_ENABLED)
    ###############################################################################
    # NLS
    --- a/gjs/CMakeLists.txt Sat May 24 15:59:57 2014 -0500
    +++ b/gjs/CMakeLists.txt Thu Jun 05 18:19:51 2014 -0500
    @@ -32,5 +32,7 @@
    install(TARGETS gplugin-gjs DESTINATION lib/gplugin)
    endif(BUILD_GJS)
    -add_subdirectory(tests)
    +if(TESTING_ENABLED)
    + add_subdirectory(tests)
    +endif(TESTING_ENABLED)
    --- a/gplugin/CMakeLists.txt Sat May 24 15:59:57 2014 -0500
    +++ b/gplugin/CMakeLists.txt Thu Jun 05 18:19:51 2014 -0500
    @@ -282,5 +282,7 @@
    ###############################################################################
    # subdirectories
    ###############################################################################
    -add_subdirectory(tests)
    +if(TESTING_ENABLED)
    + add_subdirectory(tests)
    +endif(TESTING_ENABLED)
    --- a/gplugin/tests/CMakeLists.txt Sat May 24 15:59:57 2014 -0500
    +++ b/gplugin/tests/CMakeLists.txt Thu Jun 05 18:19:51 2014 -0500
    @@ -143,4 +143,3 @@
    DEPENDS ${GTESTER_LOG} ${GTESTER_JUNIT}
    )
    -
    --- a/lua/CMakeLists.txt Sat May 24 15:59:57 2014 -0500
    +++ b/lua/CMakeLists.txt Thu Jun 05 18:19:51 2014 -0500
    @@ -79,5 +79,7 @@
    install(TARGETS gplugin-lua DESTINATION lib/gplugin)
    endif(BUILD_LUA)
    -add_subdirectory(tests)
    +if(TESTING_ENABLED)
    + add_subdirectory(tests)
    +endif(TESTING_ENABLED)
    --- a/python/CMakeLists.txt Sat May 24 15:59:57 2014 -0500
    +++ b/python/CMakeLists.txt Thu Jun 05 18:19:51 2014 -0500
    @@ -104,5 +104,7 @@
    install(TARGETS gplugin-python DESTINATION lib/gplugin)
    endif(BUILD_PYTHON)
    -add_subdirectory(tests)
    +if(TESTING_ENABLED)
    + add_subdirectory(tests)
    +endif(TESTING_ENABLED)
    --- a/seed/CMakeLists.txt Sat May 24 15:59:57 2014 -0500
    +++ b/seed/CMakeLists.txt Thu Jun 05 18:19:51 2014 -0500
    @@ -36,5 +36,7 @@
    install(TARGETS gplugin-seed DESTINATION lib/gplugin)
    endif(BUILD_SEED)
    -add_subdirectory(tests)
    +if(TESTING_ENABLED)
    + add_subdirectory(tests)
    +endif(TESTING_ENABLED)