diff options
| author | Karl Schultz <karl@lunarg.com> | 2016-09-27 18:38:02 -0600 |
|---|---|---|
| committer | Karl Schultz <karl@lunarg.com> | 2016-09-28 18:12:19 -0600 |
| commit | c4a4553a0eaf14bbddb8bac450543df3d98e2bc0 (patch) | |
| tree | b44875c92e6297567be922171c3ffde344ada593 /loader | |
| parent | 2f818fb3b0f1de0b43948b20b1e07d0d52710def (diff) | |
| download | usermoji-c4a4553a0eaf14bbddb8bac450543df3d98e2bc0.tar.xz | |
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
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
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 "$<$<CONFIG:DEBUG>:${LOCAL_C_FLAGS_REL}>") add_library(vulkan-${MAJOR} SHARED $<TARGET_OBJECTS:loader-opt> $<TARGET_OBJECTS:loader-norm> ${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 $<TARGET_OBJECTS:loader-opt> $<TARGET_OBJECTS:loader-norm>) set_target_properties(VKstatic.${MAJOR} PROPERTIES OUTPUT_NAME VKstatic.${MAJOR}) target_link_libraries(vulkan-${MAJOR} shlwapi) |