Skip to content

Commit 113b0be

Browse files
committed
Update CMake files
* use current source dir to allow other projects to easily integrate GPA's build This should address the issue mentioned here: #36
1 parent 0531975 commit 113b0be

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ cmake_minimum_required(VERSION 3.5.1)
33

44
set(DEPTH "./")
55

6-
set(GPA_CMAKE_MODULES_DIR ${CMAKE_SOURCE_DIR}/CMakeModules)
6+
message("CMake: Generating project files for GPA....")
7+
set(GPA_CMAKE_MODULES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
78

89
include(${GPA_CMAKE_MODULES_DIR}/CommonDefs.cmake)
910
include(${GPA_CMAKE_MODULES_DIR}/BuildFlags.cmake)
@@ -18,3 +19,4 @@ set(GPA_ALL_OPEN_SOURCE ON)
1819
project(GPUPerfAPI${AMDTInternalSuffix} VERSION ${GPA_MAJOR_VERSION}.${GPA_MINOR_VERSION} LANGUAGES C CXX)
1920

2021
include(${GPA_CMAKE_MODULES_DIR}/Targets.cmake)
22+
message("CMake: Finished generating project files for GPA.")

CMakeModules/CommonDefs.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ set(GPA_MAJOR_VERSION 3)
66
set(GPA_MINOR_VERSION 0)
77

88
if(NOT DEFINED GPA_ROOT)
9-
set(GPA_ROOT ${CMAKE_SOURCE_DIR})
9+
set(GPA_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
1010
endif()
1111

1212
if(NOT DEFINED GPA_OUTPUT_DIR)
13-
set(GPA_OUTPUT_DIR ${CMAKE_SOURCE_DIR}/Output)
13+
set(GPA_OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Output)
1414
endif()
1515

1616
## Set the Common Directories

0 commit comments

Comments
 (0)