linux: use linux naming conventions

diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index ad0c069..ebc406b 100644 (file)
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -10,7 +10,12 @@ file(COPY ${TEXTURES} DESTINATION ${CMAKE_BINARY_DIR}/demos)
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
-set (LIBRARIES "vulkan-${MAJOR}")
+if(WIN32)
+  set (LIBRARIES "vulkan-${MAJOR}")
+elseif(UNIX)
+  set (LIBRARIES "vulkan")
+else()
+endif()
 
 if(WIN32)
     # For Windows, since 32-bit and 64-bit items can co-exist, we build each in its own build directory.
@@ -71,7 +76,7 @@ if(NOT WIN32)
        "${PROJECT_SOURCE_DIR}/icd/common"
        )
 
-    link_libraries(${XCB_LIBRARIES} vulkan-${MAJOR} m)
+    link_libraries(${XCB_LIBRARIES} vulkan m)
 endif()
 if(WIN32)
     include_directories (

diff --git a/libs/vkjson/CMakeLists.txt b/libs/vkjson/CMakeLists.txt
index 3fb5704..b650609 100644 (file)
--- a/libs/vkjson/CMakeLists.txt
+++ b/libs/vkjson/CMakeLists.txt
@@ -38,5 +38,12 @@ else()
     add_executable(vkjson_unittest vkjson_unittest.cc)
     add_executable(vkjson_info vkjson_info.cc)
 endif()
+
 target_link_libraries(vkjson_unittest vkjson)
-target_link_libraries(vkjson_info vkjson vulkan-${MAJOR})
+
+if(WIN32)
+    target_link_libraries(vkjson_info vkjson vulkan-${MAJOR})
+elseif(UNIX)
+    target_link_libraries(vkjson_info vkjson vulkan)
+else()
+endif()

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 90f1af4..b14e89d 100644 (file)
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -44,7 +44,7 @@ endif()
 if (NOT WIN32)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith")
 
-    add_library(vulkan-${MAJOR} SHARED ${LOADER_SRCS})
-    set_target_properties(vulkan-${MAJOR} PROPERTIES SOVERSION 0)
-    target_link_libraries(vulkan-${MAJOR} -ldl -lpthread -lm)
+    add_library(vulkan SHARED ${LOADER_SRCS})
+    set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "1.0.2")
+    target_link_libraries(vulkan -ldl -lpthread -lm)
 endif()

diff --git a/loader/README.md b/loader/README.md
index bf81c20..84cdfde 100644 (file)
--- a/loader/README.md
+++ b/loader/README.md
@@ -2,7 +2,7 @@
 
 ## Overview
 The Loader implements the main VK library (e.g. "vulkan-1.dll" on Windows and
-"libvulkan-1.so" on Linux).  It handles layer management and driver management.  The
+"libvulkan.so" on Linux).  It handles layer management and driver management.  The
 loader fully supports multi-gpu operation.  As part of this, it dispatches API
 calls to the correct driver, and to the correct layers, based on the GPU object
 selected by the application.

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 360c440..914d56f 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -104,7 +104,12 @@ else()
     endif()
 endif()
 
-set (LIBVK "vulkan-${MAJOR}")
+if(WIN32)
+   set (LIBVK "vulkan-${MAJOR}")
+elseif(UNIX)
+   set (LIBVK "vulkan")
+else()
+endif()
 
 add_executable(vk_layer_validation_tests layer_validation_tests.cpp ${COMMON_CPP})
 set_target_properties(vk_layer_validation_tests