Workspace sources directory detection fixed #4

Author: nemothenoone

share/modules/cmake/BCMConfig.cmake

@@ -28,18 +28,23 @@ function(cm_project INPUT_WORKSPACE_NAME INPUT_PROJECT_NAME)
     endif()
 
     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} PARENT_SCOPE)
-    set_current_source_dir(${CMAKE_CURRENT_SOURCE_DIR} CURRENT_SOURCES_DIR)
+
+    file(RELATIVE_PATH RELATIVE_DIR ${CMAKE_WORKSPACE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+
+    set(CURRENT_SOURCES_DIR ${CMAKE_WORKSPACE_SOURCES_DIR}/${RELATIVE_DIR})
     set(CURRENT_TEST_SOURCES_DIR ${CURRENT_SOURCES_DIR}/test PARENT_SCOPE)
 endfunction()
 
 function(cm_workspace WORKSPACE_NAME)
     set(options)
-    set(oneValueArgs DESCRIPTION VERSION)
+    set(oneValueArgs DESCRIPTION VERSION SOURCES_DIR)
     set(multiValueArgs LANGUAGES)
 
     cmake_parse_arguments(PARSE "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -50,8 +55,13 @@ function(cm_workspace WORKSPACE_NAME)
 
     project(${WORKSPACE_NAME} ${PARSE_VERSION} ${PARSE_DESCRIPTION} ${PARSE_LANGUAGES})
     set(CMAKE_WORKSPACE_NAME ${WORKSPACE_NAME} PARENT_SCOPE)
+    set(CMAKE_WORKSPACE_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
     string(TOUPPER ${WORKSPACE_NAME} UPPER_WORKSPACE_NAME)
     set(CMAKE_UPPER_WORKSPACE_NAME ${UPPER_WORKSPACE_NAME} PARENT_SCOPE)
+
+    if(PARSE_SOURCES_DIR)
+        set(CMAKE_WORKSPACE_SOURCES_DIR ${PARSE_SOURCES_DIR} PARENT_SCOPE)
+    endif()
 endfunction()
 
 function(patch_file INPUT_SOURCE INPUT_PATCH OUTPUT_DIRECTORY)
@@ -75,12 +85,7 @@ function(patch_directory SOURCES_DIRECTORY PATCHES_DIRECTORY OUTPUT_DIRECTORY)
     endif()
     file(GLOB_RECURSE PATCHES_FILES LIST_DIRECTORIES FALSE ${PATCHES_DIRECTORY}/*.patch)
     file(GLOB_RECURSE SOURCES_FILES LIST_DIRECTORIES FALSE ${SOURCES_DIRECTORY}/*)
-    message(PTCH = ${PATCHES_DIRECTORY})
-    message(SRC = ${SOURCES_DIRECTORY})
     foreach(PATCH_FILE IN LISTS PATCHES_FILES)
-        #get_filename_component(PATHC_FILE_NAME ${PATCH_FILE} NAME)
-        #message("SOURCES_DIRECTORY=" ${SOURCES_DIRECTORY})
-        #message("PATHC_FILE_NAME=" ${PATCHES_DIRECTORY})
         string(REPLACE ".patch" "" SOURCE_FILE_NAME ${PATCH_FILE})
         string(REPLACE ${PATCHES_DIRECTORY} ${SOURCES_DIRECTORY} SOURCE_FILE_NAME ${SOURCE_FILE_NAME})
 
@@ -91,9 +96,4 @@ function(patch_directory SOURCES_DIRECTORY PATCHES_DIRECTORY OUTPUT_DIRECTORY)
         list(GET SOURCES_FILES ${SOURCES_FILE_FIND} SOURCE_FILE)
         patch_file(${SOURCE_FILE} ${PATCH_FILE} ${OUTPUT_DIRECTORY})
     endforeach()
-endfunction()
-
-function(set_current_source_dir WORKSPACE_SOURCE RESULT_NAME)
-    string(REPLACE "/libs" "/${BUILD_WITH_SOURCES_DIR}/libs" CURRENT_SOURCES_DIR ${WORKSPACE_SOURCE})
-    set(${RESULT_NAME} ${CURRENT_SOURCES_DIR} PARENT_SCOPE)
 endfunction()