diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3ed99a0..65d08bf0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,8 @@ cmake_minimum_required(VERSION 3.5.1)
 
 set(DEPTH "./")
 
-set(GPA_CMAKE_MODULES_DIR   ${CMAKE_SOURCE_DIR}/CMakeModules)
+message("CMake: Generating project files for GPA....")
+set(GPA_CMAKE_MODULES_DIR   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
 
 include(${GPA_CMAKE_MODULES_DIR}/CommonDefs.cmake)
 include(${GPA_CMAKE_MODULES_DIR}/BuildFlags.cmake)
@@ -18,3 +19,4 @@ set(GPA_ALL_OPEN_SOURCE ON)
 project(GPUPerfAPI${AMDTInternalSuffix} VERSION ${GPA_MAJOR_VERSION}.${GPA_MINOR_VERSION} LANGUAGES C CXX)
 
 include(${GPA_CMAKE_MODULES_DIR}/Targets.cmake)
+message("CMake: Finished generating project files for GPA.")
diff --git a/CMakeModules/CommonDefs.cmake b/CMakeModules/CommonDefs.cmake
index 46d324e2..d947e5f1 100644
--- a/CMakeModules/CommonDefs.cmake
+++ b/CMakeModules/CommonDefs.cmake
@@ -6,11 +6,11 @@ set(GPA_MAJOR_VERSION 3)
 set(GPA_MINOR_VERSION 0)
 
 if(NOT DEFINED GPA_ROOT)
-    set(GPA_ROOT ${CMAKE_SOURCE_DIR})
+    set(GPA_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
 if(NOT DEFINED GPA_OUTPUT_DIR)
-    set(GPA_OUTPUT_DIR ${CMAKE_SOURCE_DIR}/Output)
+    set(GPA_OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Output)
 endif()
 
 ## Set the Common Directories