CMake: Make final fixes for Windows.

2 files changed, 8 insertions, 6 deletions

diff --git a/contrib/blast/CMakeLists.txt b/contrib/blast/CMakeLists.txt
index 6f3ba383..9b20fdad 100644
--- a/contrib/blast/CMakeLists.txt
+++ b/contrib/blast/CMakeLists.txt
@@ -18,6 +18,7 @@ include(CMakePackageConfigHelpers)
 if(WIN32 OR CYGWIN)
     set(zlibblast_static_suffix "s")
     set(CMAKE_DEBUG_POSTFIX "d")
+    set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 endif(WIN32 OR CYGWIN)
 
 function(blast_findTestEnv testName)
@@ -29,7 +30,7 @@ function(blast_findTestEnv testName)
         set(separator ":")
     endif()
 
-    string(APPEND testEnv "$<TARGET_FILE_DIR:ZLIB::ZLIB>${separator}")
+    string(APPEND testEnv "$<TARGET_FILE_DIR:BLAST::BLAST>${separator}")
     string(APPEND testEnv "$ENV{PATH}")
 
     set_tests_properties(${testName} PROPERTIES ENVIRONMENT "${testEnv}")
@@ -114,7 +115,8 @@ if(ZLIB_BLAST_INSTALL)
             TARGETS zlib_blast_blast
             COMPONENT Runtime
             EXPORT zlibBlastSharedExport
-            RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+            RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+            ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
         install(
             EXPORT zlibBlastSharedExport
             FILE blast-shared.cmake
diff --git a/contrib/blast/test/CMakeLists.txt b/contrib/blast/test/CMakeLists.txt
index d319b824..3940c1cc 100644
--- a/contrib/blast/test/CMakeLists.txt
+++ b/contrib/blast/test/CMakeLists.txt
@@ -1,8 +1,8 @@
 # if we are built from with zlib, use this path's)
-if(DEFINED ZLIB_BUILD_SHARED)
+if(DEFINED ZLIB_BUILD_BLAST)
     set(WORK_DIR ${zlib_BINARY_DIR})
-    set(inst_setup zlib_blast_install)
-else(DEFINED ZLIB_BUILD_SHARED)
+    set(inst_setup zlib_install)
+else(DEFINED ZLIB_BUILD_BLAST)
     set(WORK_DIR ${blast_BINARY_DIR})
     set(inst_setup zlib_blast_install)
     set(ZLIB_ARG "-DZLIB_DIR=${ZLIB_DIR}")
@@ -16,7 +16,7 @@ else(DEFINED ZLIB_BUILD_SHARED)
     set_tests_properties(zlib_blast_install
         PROPERTIES
             FIXTURES_SETUP zlib_blast_install)
-endif(DEFINED ZLIB_BUILD_SHARED)
+endif(DEFINED ZLIB_BUILD_BLAST)
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/findpackage_test)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/add_subdirectory_test)