From c4a4553a0eaf14bbddb8bac450543df3d98e2bc0 Mon Sep 17 00:00:00 2001 From: Karl Schultz Date: Tue, 27 Sep 2016 18:38:02 -0600 Subject: build: gh27 Allow builds in paths with spaces Add quotes around shell var expansions in the update_external_sources scripts. For Windows, remove the cmake directives to add a linker option for the DEF files. These were redundant with the DEF files getting added via the cmake add_library() directive. They were also causing difficult-to-fix problems with paths that have spaces in them. Change-Id: I741bac31bbf27deae59031b6aa916c6ab48383a6 --- loader/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'loader') diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 2758bfc4..e0ab383d 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -61,7 +61,6 @@ if (WIN32) add_library(loader-opt OBJECT ${OPT_LOADER_SRCS}) target_compile_options(loader-opt PUBLIC "$<$:${LOCAL_C_FLAGS_REL}>") add_library(vulkan-${MAJOR} SHARED $ $ ${CMAKE_CURRENT_BINARY_DIR}/vulkan-${MAJOR}.def ${CMAKE_CURRENT_SOURCE_DIR}/loader.rc) - set_target_properties(vulkan-${MAJOR} PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}/vulkan-${MAJOR}.def") add_library(VKstatic.${MAJOR} STATIC $ $) set_target_properties(VKstatic.${MAJOR} PROPERTIES OUTPUT_NAME VKstatic.${MAJOR}) target_link_libraries(vulkan-${MAJOR} shlwapi) -- cgit v1.2.3