Revert "use externally provided names of compiler shared libraries"

This reverts commit 73e6846.

Change-Id: I2b39bb5b3186f14f1077c06adca8db242abf1e6b

Author: ArturHarasimiuk

CMakeLists.txt

@@ -201,16 +201,9 @@ if(NOT IGC__IGC_TARGETS)
     message(STATUS "IGC source dir is: ${IGC_DIR}")
 
     set(IGC_OPTION__LIBRARY_NAME "igdccl")
-    set(FCL_OPTION__LIBRARY_NAME "igdfcl")
     set(IGC_OPTION__OUTPUT_DIR "${IGDRCL_BUILD_DIR}/igc")
     set(IGC_OPTION__INCLUDE_IGC_COMPILER_TOOLS OFF)
     add_subdirectory("${IGC_DIR}" "${IGDRCL_BUILD_DIR}/igc" EXCLUDE_FROM_ALL)
-    if(NOT IGC_LIBRARY_NAME)
-      set(IGC_LIBRARY_NAME "${IGC_OPTION__LIBRARY_NAME}")
-    endif()
-    if(NOT FCL_LIBRARY_NAME)
-      set(FCL_LIBRARY_NAME "${FCL_OPTION__LIBRARY_NAME}")
-    endif()
 endif()
 
 set(IGDRCL__IGC_TARGETS "${IGC__IGC_TARGETS}")
@@ -541,4 +534,3 @@ set(_CRT_SECURE_NO_WARNINGS 1)
 include(package.cmake)
 
 configure_file(config.h.in ${IGDRCL_BUILD_DIR}/config.h)
-configure_file(compiler.config.h.in ${IGDRCL_BUILD_DIR}/compiler.config.h)

compiler.config.h.in

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 - 2018, Intel Corporation
+ * Copyright (c) 2017, Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -20,15 +20,15 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "compiler.config.h"
 #include "runtime/os_interface/os_library.h"
 
 namespace Os {
+#if defined(__linux__)
 // Compiler library names
-const char *frontEndDllName = FCL_LIBRARY_NAME;
-const char *igcDllName = IGC_LIBRARY_NAME;
+const char *frontEndDllName = "libigdfcl.so";
+const char *igcDllName = "libigdccl.so";
 const char *libvaDllName = "libva.so.1";
-
+#endif //__linux__
 const char *sysFsPciPath = "/sys/bus/pci/devices/";
 const char *tbxLibName = "libtbxAccess.so";
 }