loader: update linux version to 1.
authorJeremy Hayes <jeremy@lunarg.com>
Tue, 12 Jan 2016 16:30:00 +0000 (09:30 -0700)
committerJeremy Hayes <jeremy@lunarg.com>
Tue, 12 Jan 2016 16:44:04 +0000 (09:44 -0700)
demos/CMakeLists.txt
loader/CMakeLists.txt

index a4bbc84..0b6d23c 100644 (file)
@@ -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 (
index 85d635e..cecf480 100644 (file)
@@ -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()