From 061b436e7ffede72e75a5bde7afd218d5651501c Mon Sep 17 00:00:00 2001
From: Artur Harasimiuk <artur.harasimiuk@intel.com>
Date: Wed, 15 May 2019 18:06:16 +0200
Subject: [PATCH] cpack: don't build package when dll build is disabled

Change-Id: I63b807d33ed1cddccdb485b41ea2a2176a611190
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
---
 CMakeLists.txt                  |  9 ++++++++-
 offline_compiler/CMakeLists.txt |  9 +++++++++
 package.cmake                   | 15 +--------------
 runtime/CMakeLists.txt          |  9 +++++++++
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d37dbfc65c..f77a2b898a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,12 @@ if(CMAKE_CONFIGURATION_TYPES)
     list(REMOVE_DUPLICATES CMAKE_CONFIGURATION_TYPES)
 endif()
 
+include(GNUInstallDirs)
+
+# define global property where we will collect component list to package
+define_property(GLOBAL PROPERTY NEO_COMPONENTS_LIST BRIEF_DOCS "List of components" FULL_DOCS "List of components to create packages")
+set(GLOBAL PROPERTY NEO_COMPONENTS_LIST "")
+
 set(BRANCH_TYPE "")
 set(BRANCH_DIR_SUFFIX "/${BRANCH_TYPE}")
 
@@ -746,7 +752,6 @@ if(EXISTS ${IGDRCL_SOURCE_DIR}/../internal)
   add_subdirectory_unique(${IGDRCL_SOURCE_DIR}/../internal ${IGDRCL_BUILD_DIR}/internal)
 endif(EXISTS ${IGDRCL_SOURCE_DIR}/../internal)
 
-include(package.cmake)
 add_subdirectory_unique(scripts/lint)
 
 configure_file(config.h.in ${IGDRCL_BUILD_DIR}/config.h)
@@ -758,3 +763,5 @@ configure_file(lib_names.h.in ${IGDRCL_BUILD_DIR}/lib_names.h)
 
 hide_subdir(runtime)
 add_subdirectories()
+
+include(package.cmake)
diff --git a/offline_compiler/CMakeLists.txt b/offline_compiler/CMakeLists.txt
index 9871174684..0579d0dae3 100644
--- a/offline_compiler/CMakeLists.txt
+++ b/offline_compiler/CMakeLists.txt
@@ -70,6 +70,15 @@ set(CLOC_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
 )
 add_executable(ocloc ${CLOC_SRCS})
+
+if(UNIX)
+  install(FILES $<TARGET_FILE:ocloc>
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
+    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+    COMPONENT ocloc)
+  set_property(GLOBAL APPEND PROPERTY NEO_COMPONENTS_LIST "ocloc")
+endif()
+
 add_subdirectories()
 
 create_project_source_tree(ocloc ${IGDRCL_SOURCE_DIR}/runtime)
diff --git a/package.cmake b/package.cmake
index 51c90d6d0e..d0b995341c 100644
--- a/package.cmake
+++ b/package.cmake
@@ -5,8 +5,6 @@
 #
 
 if(UNIX)
-  include(GNUInstallDirs)
-
   set(package_input_dir ${IGDRCL_BINARY_DIR}/packageinput)
   set(package_output_dir ${IGDRCL_BINARY_DIR}/packages)
 
@@ -31,12 +29,6 @@ if(UNIX)
     set(_dir_etc "/etc")
   endif()
 
-  install(FILES
-    $<TARGET_FILE:${NEO_DYNAMIC_LIB_NAME}>
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/intel-opencl
-    COMPONENT opencl
-  )
-
   set(OCL_ICD_RUNTIME_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}${NEO_DLL_NAME_BASE}${CMAKE_SHARED_LIBRARY_SUFFIX})
   install(
     CODE "file( WRITE ${IGDRCL_BINARY_DIR}/intel.icd \"${CMAKE_INSTALL_FULL_LIBDIR}/intel-opencl/${OCL_ICD_RUNTIME_NAME}\n\" )"
@@ -48,11 +40,6 @@ if(UNIX)
   )
   install(FILES ${IGDRCL_BINARY_DIR}/intel.icd DESTINATION ${_dir_etc}/OpenCL/vendors/ COMPONENT opencl)
 
-  install(FILES $<TARGET_FILE:ocloc>
-    DESTINATION ${CMAKE_INSTALL_BINDIR}
-    PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-    COMPONENT ocloc)
-
   if(NEO_CPACK_GENERATOR)
     set(CPACK_GENERATOR "${NEO_CPACK_GENERATOR}")
   else()
@@ -95,7 +82,7 @@ if(UNIX)
   set(CPACK_DEB_COMPONENT_INSTALL ON)
   set(CPACK_RPM_COMPONENT_INSTALL ON)
   set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
-  set(CPACK_COMPONENTS_ALL opencl ocloc)
+  get_property(CPACK_COMPONENTS_ALL GLOBAL PROPERTY NEO_COMPONENTS_LIST)
   set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
     /etc/ld.so.conf.d
     /usr/local
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 247546b3f6..770674e833 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -127,6 +127,15 @@ if(${GENERATE_EXECUTABLE})
     ${IGDRCL_SOURCE_DIR}/runtime/aub/aub_stream_interface.cpp
   )
 
+  if(UNIX)
+    install(FILES
+      $<TARGET_FILE:${NEO_DYNAMIC_LIB_NAME}>
+      DESTINATION ${CMAKE_INSTALL_LIBDIR}/intel-opencl
+      COMPONENT opencl
+    )
+    set_property(GLOBAL APPEND PROPERTY NEO_COMPONENTS_LIST "opencl")
+  endif()
+
   if(TARGET ${GMMUMD_LIB_NAME})
     add_dependencies(${NEO_DYNAMIC_LIB_NAME} ${GMMUMD_LIB_NAME})
   endif()