From 02eea3c1ef41b54227ba0e5a38d447d29bf12224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20Szelei?= Date: Fri, 14 Aug 2020 16:10:43 +0200 Subject: [PATCH 1/3] cmake: don't hardcode static library --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 406c5bb..d7498f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,8 @@ set(CMAKE_CXX_STANDARD 11) project(OpenCLRuntimeLoader LANGUAGES C CXX) +option(BUILD_SHARED_LIBS "Set to ON to build a shared library." OFF) + if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) include(CTest) endif() @@ -40,7 +42,7 @@ set( OpenCLRuntimeLoader_SOURCE_FILES source_group(Source FILES ${OpenCLRuntimeLoader_SOURCE_FILES}) -add_library(OpenCLRuntimeLoader STATIC ${OpenCLRuntimeLoader_SOURCE_FILES}) +add_library(OpenCLRuntimeLoader ${OpenCLRuntimeLoader_SOURCE_FILES}) set_target_properties(OpenCLRuntimeLoader PROPERTIES FOLDER "OpenCLRuntimeLoader") target_include_directories(OpenCLRuntimeLoader PUBLIC ${OpenCL_INCLUDE_DIRS}) target_compile_definitions(OpenCLRuntimeLoader PRIVATE CL_TARGET_OPENCL_VERSION=300) From 0c39ce75bbcc42c877179d2a93f1d8a9f6eab47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20Szelei?= Date: Fri, 14 Aug 2020 16:11:57 +0200 Subject: [PATCH 2/3] cmake: remove incomplete option that breaks shared libs --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7498f1..a3e0539 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") target_compile_options(OpenCLRuntimeLoader PRIVATE /EHsc) elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") target_compile_options(OpenCLRuntimeLoader PRIVATE -Wall) - set_target_properties(OpenCLRuntimeLoader PROPERTIES LINK_FLAGS "-Wl,--version-script") elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") # TODO endif() From 410d022b75d6e2541a3766938ec5fd6848a46036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20Szelei?= Date: Fri, 14 Aug 2020 16:21:40 +0200 Subject: [PATCH 3/3] cmake: don't assume that Windows == MSVC --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3e0539..429c430 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ target_include_directories(OpenCLRuntimeLoader PUBLIC ${OpenCL_INCLUDE_DIRS}) target_compile_definitions(OpenCLRuntimeLoader PRIVATE CL_TARGET_OPENCL_VERSION=300) target_link_libraries(OpenCLRuntimeLoader PRIVATE ${CMAKE_DL_LIBS}) -if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") +if(MSVC) target_compile_options(OpenCLRuntimeLoader PRIVATE /EHsc) elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") target_compile_options(OpenCLRuntimeLoader PRIVATE -Wall)