cmake: update function implem

Author: Mizux

cmake/python.cmake

@@ -125,23 +125,42 @@ if(BUILD_TESTING)
   endif()
 endif()
 
-if(BUILD_TESTING)
-  # add_python_test()
-  # CMake function to generate and build python test.
-  # Parameters:
-  #  the python filename
-  # e.g.:
-  # add_python_test(foo.py)
-  function(add_python_test FILE_NAME)
-    message(STATUS "Configuring test ${FILE_NAME} ...")
-    get_filename_component(TEST_NAME ${FILE_NAME} NAME_WE)
-    add_test(
-      NAME python_test_${TEST_NAME}
-      COMMAND ${VENV_Python3_EXECUTABLE} -m pytest ${FILE_NAME}
-      WORKING_DIRECTORY ${VENV_DIR})
-    message(STATUS "Configuring test ${FILE_NAME} done")
-  endfunction()
-endif()
+# add_python_test()
+# CMake function to generate and build python test.
+# Parameters:
+#  FILE_NAME: the python filename
+# e.g.:
+# add_python_test(
+#   FILE_NAME
+#     foo.py
+# )
+function(add_python_test)
+  if(NOT BUILD_TESTING)
+   return()
+  endif()
+
+  set(options "")
+  set(oneValueArgs FILE_NAME)
+  set(multiValueArgs "")
+  cmake_parse_arguments(TEST
+    "${options}"
+    "${oneValueArgs}"
+    "${multiValueArgs}"
+    ${ARGN}
+  )
+  if(NOT TEST_FILE_NAME)
+    message(FATAL_ERROR "no FILE_NAME provided")
+  endif()
+  get_filename_component(TEST_NAME ${TEST_FILE_NAME} NAME_WE)
+
+  message(STATUS "Configuring test ${TEST_FILE_NAME} ...")
+
+  add_test(
+    NAME python_test_${TEST_NAME}
+    COMMAND ${VENV_Python3_EXECUTABLE} -m pytest ${TEST_FILE_NAME}
+    WORKING_DIRECTORY ${VENV_DIR})
+  message(STATUS "Configuring test ${TEST_FILE_NAME} ...DONE")
+endfunction()
 
 #######################
 ##  PYTHON WRAPPERS  ##
@@ -184,7 +203,7 @@ file(GENERATE
 #  COMMAND ${CMAKE_COMMAND} -E copy setup.py setup.py
 #  WORKING_DIRECTORY python)
 
-# Look for python modules
+# Look for required python modules
 search_python_module(
   NAME setuptools
   PACKAGE setuptools)
@@ -262,18 +281,36 @@ endif()
 # add_python_example()
 # CMake function to generate and build python example.
 # Parameters:
-#  the python filename
+#  FILE_NAME: the Python filename
 # e.g.:
-# add_python_example(foo.py)
-function(add_python_example FILE_NAME)
-  message(STATUS "Configuring example ${FILE_NAME} ...")
-  get_filename_component(EXAMPLE_NAME ${FILE_NAME} NAME_WE)
+# add_python_example(
+#   FILE_NAME
+#     foo.py
+# )
+function(add_python_example)
+  if(NOT BUILD_TESTING)
+    return()
+  endif()
 
-  if(BUILD_TESTING)
-    add_test(
-      NAME python_example_${EXAMPLE_NAME}
-      COMMAND ${VENV_Python3_EXECUTABLE} ${FILE_NAME}
-      WORKING_DIRECTORY ${VENV_DIR})
+  set(options "")
+  set(oneValueArgs FILE_NAME)
+  set(multiValueArgs "")
+  cmake_parse_arguments(EXAMPLE
+    "${options}"
+    "${oneValueArgs}"
+    "${multiValueArgs}"
+    ${ARGN}
+  )
+  if(NOT EXAMPLE_FILE_NAME)
+    message(FATAL_ERROR "no FILE_NAME provided")
   endif()
-  message(STATUS "Configuring example ${FILE_NAME} done")
+  get_filename_component(EXAMPLE_NAME ${EXAMPLE_FILE_NAME} NAME_WE)
+
+  message(STATUS "Configuring example ${EXAMPLE_FILE_NAME} ...")
+
+  add_test(
+    NAME python_example_${EXAMPLE_NAME}
+    COMMAND ${VENV_Python3_EXECUTABLE} ${EXAMPLE_FILE_NAME}
+    WORKING_DIRECTORY ${VENV_DIR})
+  message(STATUS "Configuring example ${EXAMPLE_FILE_NAME} ...DONE")
 endfunction()

examples/CMakeLists.txt

@@ -9,5 +9,5 @@ endforeach()
 
 file(GLOB PYTHON_SRCS "*.py")
 foreach(FILE_NAME IN LISTS PYTHON_SRCS)
-  add_python_example(${FILE_NAME})
+  add_python_example(FILE_NAME ${FILE_NAME})
 endforeach()

tests/CMakeLists.txt

@@ -4,5 +4,5 @@ endif()
 
 file(GLOB PYTHON_SRCS "*.py")
 foreach(FILE_NAME IN LISTS PYTHON_SRCS)
-  add_python_test(${FILE_NAME})
+  add_python_test(FILE_NAME ${FILE_NAME})
 endforeach()