From 985cc1eac3573b1237011505659eecab0573c170 Mon Sep 17 00:00:00 2001
From: Kearwood Gilbert <kearwood@kearwood.com>
Date: Thu, 10 Jan 2019 22:11:43 -0800
Subject: [PATCH] CMake wrangling

---
 CMakeLists.txt | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3daef1..75c5423 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,7 +96,6 @@ list (APPEND EXTRA_LIBS hydra)
 # ---- Vulkan ----
 if(NOT ANDROID)
 find_package(Vulkan REQUIRED)
-target_link_libraries(krakenstatic)
 list (APPEND EXTRA_LIBS Vulkan::Vulkan)
 endif()
 
@@ -130,27 +129,14 @@ list (APPEND EXTRA_LIBS "${GLFW_LIBRARIES}")
 endif()
 
 
-add_library(krakendynamic MODULE ${SRCS} ${KRAKEN_PUBLIC_HEADERS})
-TARGET_LINK_LIBRARIES( krakendynamic ${EXTRA_LIBS} )
+add_library(kraken STATIC ${SRCS} ${KRAKEN_PUBLIC_HEADERS})
+TARGET_LINK_LIBRARIES( kraken ${EXTRA_LIBS} )
 SET_TARGET_PROPERTIES(
-  krakendynamic
+  kraken
 PROPERTIES
-  FRAMEWORK ON
-  SOVERSION 0
-  VERSION 0.1.0
   PUBLIC_HEADER "${KRAKEN_PUBLIC_HEADERS}"
   PRIVATE_HEADER "${PRIVATE_HEADER_FILES}"
-  ARCHIVE_OUTPUT_DIRECTORY "archive"
-  LIBRARY_OUTPUT_DIRECTORY "lib${LIB_SUFFIX}"
-  OUTPUT_NAME kraken
-)
-
-add_library(krakenstatic STATIC ${SRCS} ${KRAKEN_PUBLIC_HEADERS})
-TARGET_LINK_LIBRARIES( krakenstatic ${EXTRA_LIBS} )
-SET_TARGET_PROPERTIES(
-  krakenstatic
-PROPERTIES
-  LIBRARY_OUTPUT_DIRECTORY "lib${LIB_SUFFIX}"
+  ARCHIVE_OUTPUT_DIRECTORY "lib${LIB_SUFFIX}"
   OUTPUT_NAME kraken
 )
 
@@ -160,14 +146,14 @@ PROPERTIES
 #   COMMAND ${CMAKE_COMMAND} -E tar "cfvz" "kraken.tgz" "*"
 # )
 
-install(TARGETS krakenstatic krakendynamic
-        RUNTIME DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/bin${EX_PLATFORM}
+install(TARGETS kraken
+        RUNTIME DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/bin/win${EX_PLATFORM}
         PUBLIC_HEADER DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/include
-        ARCHIVE DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/lib${EX_PLATFORM}
-        LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/lib${EX_PLATFORM}
+        ARCHIVE DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/lib/win${EX_PLATFORM}
+        LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/${CMAKE_BUILD_TYPE}/lib/win${EX_PLATFORM}
 )
 
 IF(CMAKE_BUILD_TYPE MATCHES DEBUG)
-  install (FILES $<TARGET_PDB_FILE:krakendynamic>
-           DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/lib${EX_PLATFORM})
+  install (FILES $<TARGET_PDB_FILE:kraken>
+           DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/export/lib/win${EX_PLATFORM})
 ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG)