Use PROJECT_*_DIR instead of CMAKE_*_DIR to support subproject builds (#458)

Replace CMAKE_[SOURCE/BINARY]_DIR usage with PROJECT_[SOURCE/BINARY]_DIR to
support subproject builds. This helps make the project usable as a subproject
(e.g. via add_subdirectory or FetchContent) without polluting the parent build tree.

Signed-off-by: Schilling, Matthew <matthew.schilling@intel.com>

Author: mschilling0

CMakeLists.txt

@@ -63,14 +63,19 @@ add_definitions(-DLOADER_VERSION_MAJOR=${PROJECT_VERSION_MAJOR})
 add_definitions(-DLOADER_VERSION_MINOR=${PROJECT_VERSION_MINOR})
 add_definitions(-DLOADER_VERSION_PATCH=${PROJECT_VERSION_PATCH})
 
-file(WRITE "${CMAKE_BINARY_DIR}/VERSION" "${PROJECT_VERSION}")
+file(WRITE "${PROJECT_BINARY_DIR}/VERSION" "${PROJECT_VERSION}")
 
 string(TIMESTAMP CURRENT_YEAR "%Y")
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-
+if (NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+endif()
+if (NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+endif()
+if (NOT DEFINED CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+endif()
 #Define a path for custom commands to work around MSVC
 set(CUSTOM_COMMAND_BINARY_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 

source/drivers/null/CMakeLists.txt

@@ -82,15 +82,15 @@ if(BUILD_L0_LOADER_TESTS)
     set_target_properties(ze_intel_gpu PROPERTIES
         VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
         SOVERSION "${PROJECT_VERSION_MAJOR}"
-        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib_fake"
-        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin_fake"
+        LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib_fake"
+        RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin_fake"
     )
 
     set_target_properties(ze_intel_npu PROPERTIES
         VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
         SOVERSION "${PROJECT_VERSION_MAJOR}"
-        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib_fake"
-        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin_fake"
+        LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib_fake"
+        RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin_fake"
     )
     target_include_directories(ze_intel_gpu
         PUBLIC

test/CMakeLists.txt

@@ -34,29 +34,29 @@ endif()
 # since they are not built into the library when BUILD_STATIC=1
 if(BUILD_STATIC)
   target_sources(tests PRIVATE
-    ${CMAKE_SOURCE_DIR}/source/loader/ze_loader.cpp
-    ${CMAKE_SOURCE_DIR}/source/loader/ze_loader_api.cpp
-    ${CMAKE_SOURCE_DIR}/source/loader/ze_ldrddi.cpp
-    ${CMAKE_SOURCE_DIR}/source/loader/ze_ldrddi_driver_ddi.cpp
-    ${CMAKE_SOURCE_DIR}/source/loader/zet_ldrddi.cpp
-    ${CMAKE_SOURCE_DIR}/source/loader/zet_ldrddi_driver_ddi.cpp
-    ${CMAKE_SOURCE_DIR}/source/loader/zes_ldrddi.cpp
-    ${CMAKE_SOURCE_DIR}/source/loader/zes_ldrddi_driver_ddi.cpp
-    ${CMAKE_SOURCE_DIR}/source/loader/zer_ldrddi_driver_ddi.cpp
-    ${CMAKE_SOURCE_DIR}/source/loader/zer_ldrddi.cpp
-    ${CMAKE_SOURCE_DIR}/source/loader/zel_tracing_ldrddi.cpp
+    ${PROJECT_SOURCE_DIR}/source/loader/ze_loader.cpp
+    ${PROJECT_SOURCE_DIR}/source/loader/ze_loader_api.cpp
+    ${PROJECT_SOURCE_DIR}/source/loader/ze_ldrddi.cpp
+    ${PROJECT_SOURCE_DIR}/source/loader/ze_ldrddi_driver_ddi.cpp
+    ${PROJECT_SOURCE_DIR}/source/loader/zet_ldrddi.cpp
+    ${PROJECT_SOURCE_DIR}/source/loader/zet_ldrddi_driver_ddi.cpp
+    ${PROJECT_SOURCE_DIR}/source/loader/zes_ldrddi.cpp
+    ${PROJECT_SOURCE_DIR}/source/loader/zes_ldrddi_driver_ddi.cpp
+    ${PROJECT_SOURCE_DIR}/source/loader/zer_ldrddi_driver_ddi.cpp
+    ${PROJECT_SOURCE_DIR}/source/loader/zer_ldrddi.cpp
+    ${PROJECT_SOURCE_DIR}/source/loader/zel_tracing_ldrddi.cpp
   )
 
   # Platform-specific source files
   if(WIN32)
     target_sources(tests PRIVATE
-      ${CMAKE_SOURCE_DIR}/source/loader/windows/driver_discovery_win.cpp
-      ${CMAKE_SOURCE_DIR}/source/loader/windows/loader_init.cpp
+      ${PROJECT_SOURCE_DIR}/source/loader/windows/driver_discovery_win.cpp
+      ${PROJECT_SOURCE_DIR}/source/loader/windows/loader_init.cpp
     )
   else()
     target_sources(tests PRIVATE
-      ${CMAKE_SOURCE_DIR}/source/loader/linux/driver_discovery_lin.cpp
-      ${CMAKE_SOURCE_DIR}/source/loader/linux/loader_init.cpp
+      ${PROJECT_SOURCE_DIR}/source/loader/linux/driver_discovery_lin.cpp
+      ${PROJECT_SOURCE_DIR}/source/loader/linux/loader_init.cpp
     )
   endif()
 
@@ -68,7 +68,7 @@ if(BUILD_STATIC)
   )
 endif()
 
-target_include_directories(tests PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/source/inc)
+target_include_directories(tests PRIVATE ${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/source/inc)
 target_link_libraries(
   tests
   PRIVATE
@@ -1158,4 +1158,4 @@ add_test(NAME test_validation_layer_api_tracing_immediate_cmdlist COMMAND tests
 set_property(TEST test_validation_layer_api_tracing_immediate_cmdlist PROPERTY ENVIRONMENT "ZE_ENABLE_VALIDATION_LAYER=1;ZEL_ENABLE_LOADER_LOGGING=1;ZEL_LOADER_LOGGING_LEVEL=trace;ZE_ENABLE_NULL_DRIVER=1")
 
 add_test(NAME test_validation_layer_api_tracing_command_queue COMMAND tests --gtest_filter=ValidationLayerApiTracing.GivenValidationLayerEnabledWithTraceLevelLoggingWhenCallingCommandQueueApisThenTracingDoesNotCrash)
-set_property(TEST test_validation_layer_api_tracing_command_queue PROPERTY ENVIRONMENT "ZE_ENABLE_VALIDATION_LAYER=1;ZEL_ENABLE_LOADER_LOGGING=1;ZEL_LOADER_LOGGING_LEVEL=trace;ZE_ENABLE_NULL_DRIVER=1")
+set_property(TEST test_validation_layer_api_tracing_command_queue PROPERTY ENVIRONMENT "ZE_ENABLE_VALIDATION_LAYER=1;ZEL_ENABLE_LOADER_LOGGING=1;ZEL_LOADER_LOGGING_LEVEL=trace;ZE_ENABLE_NULL_DRIVER=1")