diff --git a/CMakeLists.txt b/CMakeLists.txt index caf681a..58b7648 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,8 @@ # Andrew Janke - a.janke@gmail.com # Vladimir S. FONOV - vladimir.fonov@gmail.com +CMAKE_MINIMUM_REQUIRED(VERSION 3.6...3.10) + PROJECT(LIBMINC) SET(LIBMINC_PACKAGE_VERSION_MAJOR 2) @@ -22,8 +24,6 @@ INCLUDE(CTest) ENABLE_TESTING() -CMAKE_MINIMUM_REQUIRED(VERSION 3.6) - IF( POLICY CMP0063 ) CMAKE_POLICY(SET CMP0063 NEW) ENDIF() @@ -445,6 +445,11 @@ IF(UNIX) SET(LIBMINC_STATIC_LIBRARIES_CONFIG ${LIBMINC_STATIC_LIBRARIES_CONFIG} m dl ${RT_LIBRARY_NAME}) ENDIF(UNIX) +if(WIN32) + add_definitions(-DMNCAPI=) + list(APPEND LIBMINC_LIBRARIES_CONFIG ws2_32) +endif() + SET(minc_LIB_SRCS ${minc2_LIB_SRCS} ${minc_common_SRCS}) SET(minc_HEADERS ${minc2_HEADERS} ${minc_common_HEADERS}) @@ -513,7 +518,7 @@ IF( LIBMINC_INSTALL_LIB_DIR ) ${LIBMINC_EXPORTED_TARGETS} LIBRARY DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries ARCHIVE DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries - RUNTIME DESTINATION ${LIBMINC_INSTALL_LIB_DIR} COMPONENT libraries + RUNTIME DESTINATION ${LIBMINC_INSTALL_BIN_DIR} COMPONENT libraries ) ENDIF( LIBMINC_INSTALL_LIB_DIR )