Change shared library install directory for windows

On Windows DLL -> "bin", import library (.lib) -> "lib"

Author: FreddieAkeroyd

CMakeLists.txt

@@ -51,14 +51,16 @@ add_custom_target(html)
 if(CMAKE_HOST_UNIX)
     #easy on Unix - just follow the GNU standard
     include(GNUInstallDirs)
-	set(STATIC_LIBRARY_SUFFIX "")
+    set(STATIC_LIBRARY_SUFFIX "")
+    set(NEXUS_INSTALL_SHLIB ${CMAKE_INSTALL_LIBDIR})
 else()
     set(CMAKE_INSTALL_LIBDIR lib)
     set(CMAKE_INSTALL_DOCDIR doc)
     set(CMAKE_INSTALL_INCLUDEDIR include)
     set(CMAKE_INSTALL_MANDIR man)
     set(CMAKE_INSTALL_BINDIR bin)
-	set(STATIC_LIBRARY_SUFFIX "Static")
+    set(STATIC_LIBRARY_SUFFIX "Static")
+    set(NEXUS_INSTALL_SHLIB ${CMAKE_INSTALL_BINDIR})
 endif() 
 
 

README.rst

@@ -150,8 +150,13 @@ These instructions will build everything except the applications using LIBXML2 (
 
   - Provide source and build paths in the relevant boxes
   - Click on Configure, choose appropriate visual studio version when prompted
-  - A list of options will appear, choose the appropriate ENABLE_ ones and press Configure again
-  - If nothing is red, click on Generate
+  - A list of options will appear, choose the appropriate ENABLE_ ones
+  - Also check the CMAKE_INSTALL_PREFIX is appropriate, this is the root where file may be installed to later
+  - press Configure again
+  - If anything now appears in red, it means it is a newly displayed option. If you change ones of these (or any other value) you need to pres Configure again, otherwise move onto the next step 
+  - Click on Generate 
 
 * Browse to the build directory and open the generated NeXus.sln
 * Build the solution
+
+  - If you wish to copy files to the install directory above, right click and Build the INSTALL project 

bindings/cpp/CMakeLists.txt

@@ -52,7 +52,7 @@ set_target_properties(NeXus_CPP_Shared_Library PROPERTIES
                       SOVERSION ${ABI_CURRENT})
 
 install (TARGETS NeXus_CPP_Shared_Library
-         RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
+         RUNTIME DESTINATION ${NEXUS_INSTALL_SHLIB} COMPONENT Runtime
          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
 
 install (TARGETS NeXus_CPP_Static_Library 

bindings/f77/CMakeLists.txt

@@ -36,7 +36,7 @@ set (SOURCES napif.f)
 add_library (NeXus_F77_Static_Library STATIC ${HEADERS} ${SOURCES})
 
 set_target_properties(NeXus_F77_Static_Library PROPERTIES 
-                      OUTPUT_NAME NeXus77)
+                      OUTPUT_NAME NeXus77${STATIC_LIBRARY_SUFFIX})
 
 target_link_libraries(NeXus_F77_Static_Library NeXus_Static_Library)
 
@@ -52,9 +52,13 @@ set_target_properties(NeXus_F77_Shared_Library PROPERTIES
 
 target_link_libraries(NeXus_F77_Shared_Library NeXus_Shared_Library)
 
-install (TARGETS NeXus_F77_Static_Library NeXus_F77_Shared_Library
-         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/nexus COMPONENT Development)
+install (TARGETS NeXus_F77_Shared_Library
+         RUNTIME DESTINATION ${NEXUS_INSTALL_SHLIB} COMPONENT Runtime
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
+
+install (TARGETS NeXus_F77_Static_Library 
+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/nexus
+         COMPONENT Development)
 
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/napif.inc 
          DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/nexus 

bindings/f90/CMakeLists.txt

@@ -34,7 +34,7 @@ set (SOURCES NXmodule.f90 NXUmodule.f90)
 #------------------------------------------------------------------------------
 
 add_library (NeXus_F90_Static_Library STATIC ${SOURCES})
-set_target_properties(NeXus_F90_Static_Library PROPERTIES OUTPUT_NAME NeXus90)
+set_target_properties(NeXus_F90_Static_Library PROPERTIES OUTPUT_NAME NeXus90${STATIC_LIBRARY_SUFFIX})
 target_link_libraries(NeXus_F90_Static_Library NeXus_Static_Library)
 
 #------------------------------------------------------------------------------
@@ -51,6 +51,10 @@ set_target_properties(NeXus_F90_Shared_Library PROPERTIES
 
 target_link_libraries(NeXus_F90_Shared_Library NeXus_Shared_Library )
 
-install (TARGETS NeXus_F90_Static_Library NeXus_F90_Shared_Library
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/nexus COMPONENT Development)
+install (TARGETS NeXus_F90_Shared_Library
+         RUNTIME DESTINATION ${NEXUS_INSTALL_SHLIB} COMPONENT Runtime
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
+
+install (TARGETS NeXus_F90_Static_Library 
+         DESTINATION ${CMAKE_INSTALL_LIBDIR}/nexus
+         COMPONENT Development)

src/CMakeLists.txt

@@ -101,7 +101,7 @@ target_link_libraries(NeXus_Shared_Library ${NAPI_LINK_LIBS})
 # install the targets
 #-----------------------------------------------------------------------------
 install (TARGETS NeXus_Shared_Library
-         RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
+         RUNTIME DESTINATION ${NEXUS_INSTALL_SHLIB} COMPONENT Runtime
          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
 
 install (TARGETS NeXus_Static_Library