Fixing symtab for windows

Signed-off-by: Jaroslaw Chodor <[email protected]>
oneapi-src · Mar 20, 2020 · 136a07f · 136a07f
1 parent ea22ea6
commit 136a07f
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 98 deletions.
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -2,21 +2,18 @@
 # SPDX-License-Identifier: MIT
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc)
 
-if(UNIX)
 set(TARGET_LOADER_NAME ze_loader)
 include(GNUInstallDirs)
 add_library(${TARGET_LOADER_NAME}
     SHARED
     ""
 )
-endif()
 
 add_subdirectory(lib)
 add_subdirectory(loader)
 add_subdirectory(layers)
 add_subdirectory(wrapper)
 
-if(UNIX)
 target_compile_definitions(${TARGET_LOADER_NAME}
     PRIVATE
         ZE_ENABLE_OCL_INTEROP=1
@@ -31,8 +28,6 @@ target_link_libraries(${TARGET_LOADER_NAME}
     ${CMAKE_DL_LIBS}
 )
 
-endif()
-
 install(TARGETS ze_loader
     LIBRARY
         DESTINATION ${CMAKE_INSTALL_LIBDIR}

diff --git a/source/lib/core/CMakeLists.txt b/source/lib/core/CMakeLists.txt
@@ -2,42 +2,6 @@
 # SPDX-License-Identifier: MIT
 set(TARGET_NAME ze_api)
 
-if(MSVC)
-add_library(${TARGET_NAME}
-    STATIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_driver.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_device.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdqueue.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdlist.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_barrier.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_cl_interop.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_copy.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_event.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_fence.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_image.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_memory.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_module.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_residency.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_sampler.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_core_lib.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_lib.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_lib.cpp
-)
-
-target_include_directories(${TARGET_NAME}
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-target_compile_definitions(${TARGET_NAME}
-    PRIVATE
-        ZE_ENABLE_OCL_INTEROP=1
-)
-
-target_link_libraries(${TARGET_NAME}
-    ${CMAKE_DL_LIBS}
-)
-else()
 target_sources(${TARGET_LOADER_NAME}
     PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/ze_driver.cpp
@@ -58,7 +22,6 @@ target_sources(${TARGET_LOADER_NAME}
         ${CMAKE_CURRENT_SOURCE_DIR}/ze_lib.h
         ${CMAKE_CURRENT_SOURCE_DIR}/ze_lib.cpp
 )
-endif()
 
 file(GLOB LEVEL_ZERO_LIBRARY_CORE_INCLUDES
     "*.h"

diff --git a/source/lib/tools/CMakeLists.txt b/source/lib/tools/CMakeLists.txt
@@ -2,38 +2,6 @@
 # SPDX-License-Identifier: MIT
 set(TARGET_NAME zet_api)
 
-if(MSVC)
-add_library(${TARGET_NAME}
-    STATIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_common.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_driver.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_device.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_cmdlist.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_debug.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_metric.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_module.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_pin.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_sysman.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_tools_lib.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_lib.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/zet_lib.cpp
-)
-
-target_include_directories(${TARGET_NAME}
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-target_compile_definitions(${TARGET_NAME}
-    PRIVATE
-        ZE_ENABLE_OCL_INTEROP=1
-)
-
-target_link_libraries(${TARGET_NAME}
-    ${CMAKE_DL_LIBS}
-)
-else()
 target_sources(${TARGET_LOADER_NAME}
     PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/zet_common.cpp
@@ -50,7 +18,6 @@ target_sources(${TARGET_LOADER_NAME}
         ${CMAKE_CURRENT_SOURCE_DIR}/zet_lib.h
         ${CMAKE_CURRENT_SOURCE_DIR}/zet_lib.cpp
 )
-endif()
 
 file(GLOB LEVEL_ZERO_LIBRARY_TOOLS_INCLUDES
     "*.h"

diff --git a/source/loader/CMakeLists.txt b/source/loader/CMakeLists.txt
@@ -1,28 +1,6 @@
 # Copyright (C) 2020 Intel Corporation
 # SPDX-License-Identifier: MIT
-if (MSVC)
-set(TARGET_NAME ze_loader)
 
-add_library(${TARGET_NAME}
-    SHARED
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_object.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_loader.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_loader.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_core_loader.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/ze_tools_loader.cpp
-)
-
-target_include_directories(${TARGET_NAME}
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-target_compile_definitions(${TARGET_NAME}
-    PRIVATE
-        ZE_ENABLE_OCL_INTEROP=1
-)
-
-else()
 target_sources(${TARGET_LOADER_NAME}
     PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/ze_object.h
@@ -31,7 +9,6 @@ target_sources(${TARGET_LOADER_NAME}
         ${CMAKE_CURRENT_SOURCE_DIR}/ze_core_loader.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/ze_tools_loader.cpp
 )
-endif()
 
 file(GLOB LEVEL_ZERO_LOADER_INCLUDES
     "*.h"