Project functions fixes

Author: nemothenoone

share/modules/cmake/BCMConfig.cmake

@@ -16,7 +16,7 @@ function(find_subdirectories INPUT_DIRECTORY SUBMODULE_HEADER)
     endforeach()
 endfunction()
 
-macro(cm_project INPUT_WORKSPACE_NAME INPUT_PROJECT_NAME)
+function(cm_project INPUT_WORKSPACE_NAME INPUT_PROJECT_NAME)
     set(options)
     set(oneValueArgs DESCRIPTION VERSION)
     set(multiValueArgs LANGUAGES)
@@ -29,13 +29,15 @@ macro(cm_project INPUT_WORKSPACE_NAME INPUT_PROJECT_NAME)
 
     project(${INPUT_WORKSPACE_NAME}_${INPUT_PROJECT_NAME} ${PARSE_VERSION} ${PARSE_DESCRIPTION} ${PARSE_LANGUAGES})
     set(CURRENT_PROJECT_NAME ${INPUT_PROJECT_NAME})
+    set(CMAKE_PROJECT_NAME ${CMAKE_PROJECT_NAME} PARENT_SCOPE)
+    set(PROJECT_NAME ${INPUT_PROJECT_NAME} PARENT_SCOPE)
     string(TOUPPER ${INPUT_PROJECT_NAME} UPPER_PROJECT_NAME)
     set(CURRENT_UPPER_PROJECT_NAME ${UPPER_PROJECT_NAME})
     set_current_source_dir(${CMAKE_CURRENT_SOURCE_DIR} CURRENT_SOURCES_DIR)
     set(CURRENT_TEST_SOURCES_DIR ${CURRENT_SOURCES_DIR}/test)
-endmacro()
+endfunction()
 
-macro(cm_workspace WORKSPACE_NAME)
+function(cm_workspace WORKSPACE_NAME)
     set(options)
     set(oneValueArgs DESCRIPTION VERSION)
     set(multiValueArgs LANGUAGES)
@@ -47,10 +49,10 @@ macro(cm_workspace WORKSPACE_NAME)
     endif()
 
     project(${WORKSPACE_NAME} ${PARSE_VERSION} ${PARSE_DESCRIPTION} ${PARSE_LANGUAGES})
-    set(CMAKE_WORKSPACE_NAME ${WORKSPACE_NAME})
+    set(CMAKE_WORKSPACE_NAME ${WORKSPACE_NAME} PARENT_SCOPE)
     string(TOUPPER ${WORKSPACE_NAME} UPPER_WORKSPACE_NAME)
-    set(CMAKE_UPPER_WORKSPACE_NAME ${UPPER_WORKSPACE_NAME})
-endmacro()
+    set(CMAKE_UPPER_WORKSPACE_NAME ${UPPER_WORKSPACE_NAME} PARENT_SCOPE)
+endfunction()
 
 function(patch_file INPUT_SOURCE INPUT_PATCH OUTPUT_DIRECTORY)
     find_package(Patch)
@@ -83,7 +85,7 @@ function(patch_directory SOURCES_DIRECTORY PATCHES_DIRECTORY OUTPUT_DIRECTORY)
         string(REPLACE ${PATCHES_DIRECTORY} ${SOURCES_DIRECTORY} SOURCE_FILE_NAME ${SOURCE_FILE_NAME})
 
         list(FIND SOURCES_FILES ${SOURCE_FILE_NAME} SOURCES_FILE_FIND)
-        if (${SOURCES_FILE_FIND} EQUAL -1)
+        if(${SOURCES_FILE_FIND} EQUAL -1)
             message(FATAL_ERROR "Source file for patch is not found: " ${PATCH_FILE})
         endif()
         list(GET SOURCES_FILES ${SOURCES_FILE_FIND} SOURCE_FILE)