Workspace and project functions moved to be a macros to get

CMAKE_PROJECT_NAME and PROJECT_NAME directives working. Basic non-tested
single file patching functions implemented.

Author: nemothenoone

share/modules/cmake/BCMConfig.cmake

@@ -16,7 +16,7 @@ function(find_subdirectories INPUT_DIRECTORY SUBMODULE_HEADER)
     endforeach()
 endfunction()
 
-function(cm_project WORKSPACE_NAME PROJECT_NAME)
+macro(cm_project INPUT_WORKSPACE_NAME INPUT_PROJECT_NAME)
     set(options)
     set(oneValueArgs DESCRIPTION VERSION)
     set(multiValueArgs LANGUAGES)
@@ -27,13 +27,13 @@ function(cm_project WORKSPACE_NAME PROJECT_NAME)
         message(FATAL_ERROR "Unknown keywords given to workspace(): \"${PARSE_UNPARSED_ARGUMENTS}\"")
     endif()
 
-    project(${WORKSPACE_NAME}_${PROJECT_NAME} ${PARSE_VERSION} ${PARSE_DESCRIPTION} ${PARSE_LANGUAGES})
-    set(CURRENT_PROJECT_NAME ${PROJECT_NAME} PARENT_SCOPE)
-    string(TOUPPER ${PROJECT_NAME} UPPER_PROJECT_NAME)
-    set(CURRENT_UPPER_PROJECT_NAME ${UPPER_PROJECT_NAME} PARENT_SCOPE)
-endfunction()
+    project(${INPUT_WORKSPACE_NAME}_${INPUT_PROJECT_NAME} ${PARSE_VERSION} ${PARSE_DESCRIPTION} ${PARSE_LANGUAGES})
+    set(CURRENT_PROJECT_NAME ${INPUT_PROJECT_NAME})
+    string(TOUPPER ${INPUT_PROJECT_NAME} UPPER_PROJECT_NAME)
+    set(CURRENT_UPPER_PROJECT_NAME ${UPPER_PROJECT_NAME})
+endmacro()
 
-function(cm_workspace WORKSPACE_NAME)
+macro(cm_workspace WORKSPACE_NAME)
     set(options)
     set(oneValueArgs DESCRIPTION VERSION)
     set(multiValueArgs LANGUAGES)
@@ -45,25 +45,19 @@ function(cm_workspace WORKSPACE_NAME)
     endif()
 
     project(${WORKSPACE_NAME} ${PARSE_VERSION} ${PARSE_DESCRIPTION} ${PARSE_LANGUAGES})
-    set(CMAKE_WORKSPACE_NAME ${WORKSPACE_NAME} PARENT_SCOPE)
+    set(CMAKE_WORKSPACE_NAME ${WORKSPACE_NAME})
     string(TOUPPER ${WORKSPACE_NAME} UPPER_WORKSPACE_NAME)
-    set(CMAKE_UPPER_WORKSPACE_NAME ${UPPER_WORKSPACE_NAME} PARENT_SCOPE)
-endfunction()
+    set(CMAKE_UPPER_WORKSPACE_NAME ${UPPER_WORKSPACE_NAME})
+endmacro()
 
-function(patch_directory SOURCES_DIRECTORY PATCHES_DIRECTORY OUTPUT_DIRECTORY)
+function(patch_file INPUT_SOURCE INPUT_PATCH OUTPUT_DIRECTORY)
     find_package(Patch)
     if(NOT Patch_FOUND)
         message(FATAL_ERROR "Patch utulity is not found")
     endif()
 
-    file(GLOB_RECURSE ${PATCHES_FILES} LIST_DIRECTORIES FALSE ${PATCHES_DIRECTORY})
-    file(GLOB_RECURSE ${SOURCES_FILES} LIST_DIRECTORIES FALSE ${SOURCES_DIRECTORY})
-
-    foreach(PATCH_FILE IN PATCHES_FILES)
-        string(REPLACE ".patch" ${PATCH_FILE} PATCH_FILE_NAME)
-        list(FIND ${SOURCES_FILES} PATCH_FILE)
-        execute_process(COMMAND patch)
-    endforeach()
+    execute_process(COMMAND patch ${INPUT_SOURCE} ${INPUT_PATCH}
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 endfunction()
 
 function(patch_directory SOURCES_DIRECTORY PATCHES_DIRECTORY OUTPUT_DIRECTORY)

share/modules/cmake/BCMInstallTargets.cmake

@@ -27,7 +27,6 @@ function(cm_install_targets)
 
 
     if(NOT PARSE_SKIP_HEADER_INSTALL)
-        message(STATUS "cm_install_targets.proceed-with-install ${INCLUDE_INSTALL_DIR}  ")
         foreach(INCLUDE ${PARSE_INCLUDE})
             install(DIRECTORY ${INCLUDE}/ DESTINATION ${INCLUDE_INSTALL_DIR})
         endforeach()