diff options
| author | Jeremy Hayes <jeremy@lunarg.com> | 2016-01-12 09:30:00 -0700 |
|---|---|---|
| committer | Jeremy Hayes <jeremy@lunarg.com> | 2016-01-12 09:44:04 -0700 |
| commit | ddb9f82824adbd4163b2cd3adfe9b4d84c06426c (patch) | |
| tree | 7a8e5a3c8433597909855c63f5995e8715efdf48 | |
| parent | aaa11c11cc5dafa791fb3439fab8a1ce7f21a19f (diff) | |
| download | usermoji-ddb9f82824adbd4163b2cd3adfe9b4d84c06426c.tar.xz | |
loader: update linux version to 1.
| -rw-r--r-- | demos/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | loader/CMakeLists.txt | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index a4bbc84e..0b6d23cc 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -10,11 +10,7 @@ file(COPY ${TEXTURES} DESTINATION ${CMAKE_BINARY_DIR}/demos) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVK_PROTOTYPES") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVK_PROTOTYPES") -if(WIN32) - set (LIBRARIES "vulkan-${MAJOR}") -else () - set (LIBRARIES "vulkan") -endif() +set (LIBRARIES "vulkan-${MAJOR}") if(WIN32) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv @@ -67,7 +63,7 @@ if(NOT WIN32) "${PROJECT_SOURCE_DIR}/icd/common" ) - link_libraries(${XCB_LIBRARIES} vulkan m) + link_libraries(${XCB_LIBRARIES} vulkan-${MAJOR} m) endif() if(WIN32) include_directories ( diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 85d635eb..cecf4804 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -44,7 +44,7 @@ endif() if (NOT WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVK_PROTOTYPES -Wpointer-arith") - add_library(vulkan SHARED ${LOADER_SRCS}) - set_target_properties(vulkan PROPERTIES SOVERSION 0) - target_link_libraries(vulkan -ldl -lpthread -lm) + add_library(vulkan-${MAJOR} SHARED ${LOADER_SRCS}) + set_target_properties(vulkan-${MAJOR} PROPERTIES SOVERSION 0) + target_link_libraries(vulkan-${MAJOR} -ldl -lpthread -lm) endif() |