From 88ef0dc3fea3eb6b7e5d8bce6237fd519eae6967 Mon Sep 17 00:00:00 2001 From: Matt Dawkins Date: Wed, 19 Jul 2017 13:45:38 -0700 Subject: [PATCH 1/8] Begin to add windows support --- TPL/CMakeLists.txt | 38 +++++++++++-------- TPL/flann-1.8.4/CMakeLists.txt | 7 +++- .../src/cpp/flann/util/serialization.h | 4 +- 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/TPL/CMakeLists.txt b/TPL/CMakeLists.txt index 210bb4f21..d099ad24c 100644 --- a/TPL/CMakeLists.txt +++ b/TPL/CMakeLists.txt @@ -3,6 +3,7 @@ include(ExternalProject) option(SMQTK_BUILD_LIBSVM "Enable building of libSVM." ON) option(SMQTK_BUILD_FLANN "Enable building of FLANN." ON) +option(SMQTK_BUILD_EXAMPLES "Enable building examples." ON) # Variables defined by parent module: # TPL_BUILD_PREFIX - Where build files will go @@ -14,22 +15,26 @@ option(SMQTK_BUILD_FLANN "Enable building of FLANN." ON) # libSVM # if (SMQTK_BUILD_LIBSVM) - set(libSVM_DIR "${CMAKE_CURRENT_LIST_DIR}/libsvm-3.1-custom") - ExternalProject_Add(libSVM - PREFIX "${TPL_BUILD_PREFIX}" - SOURCE_DIR "${libSVM_DIR}" - CONFIGURE_COMMAND "" - BUILD_IN_SOURCE 1 - BUILD_COMMAND $(MAKE) lib - INSTALL_DIR "${TPL_LOCAL_INSTALL}" - INSTALL_COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/lib" - COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/include" - COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_PYTHON_SP}" - COMMAND "${CMAKE_COMMAND}" -E copy libsvm.so.2 "${TPL_LOCAL_INSTALL}/lib" - COMMAND "${CMAKE_COMMAND}" -E copy svm.h "${TPL_LOCAL_INSTALL}/include" - COMMAND "${CMAKE_COMMAND}" -E copy python/svm.py "${TPL_PYTHON_SP}" - COMMAND "${CMAKE_COMMAND}" -E copy python/svmutil.py "${TPL_PYTHON_SP}" - ) + if (WIN32) + message(FATAL_ERROR "Internal LibSVM build does not support windows") + else() + set(libSVM_DIR "${CMAKE_CURRENT_LIST_DIR}/libsvm-3.1-custom") + ExternalProject_Add(libSVM + PREFIX "${TPL_BUILD_PREFIX}" + SOURCE_DIR "${libSVM_DIR}" + CONFIGURE_COMMAND "" + BUILD_IN_SOURCE 1 + BUILD_COMMAND $(MAKE) lib + INSTALL_DIR "${TPL_LOCAL_INSTALL}" + INSTALL_COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/lib" + COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/include" + COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_PYTHON_SP}" + COMMAND "${CMAKE_COMMAND}" -E copy libsvm.so.2 "${TPL_LOCAL_INSTALL}/lib" + COMMAND "${CMAKE_COMMAND}" -E copy svm.h "${TPL_LOCAL_INSTALL}/include" + COMMAND "${CMAKE_COMMAND}" -E copy python/svm.py "${TPL_PYTHON_SP}" + COMMAND "${CMAKE_COMMAND}" -E copy python/svmutil.py "${TPL_PYTHON_SP}" + ) + endif() endif() @@ -55,6 +60,7 @@ if (SMQTK_BUILD_FLANN) -DBUILD_MATLAB_BINDINGS:BOOL=OFF -DBUILD_CUDA_LIB:BOOL=OFF -DBUILD_PYTHON_BINDINGS:BOOL=OFF + -DBUILD_EXAMPLES:BOOL=${SMQTK_BUILD_EXAMPLES} #-DLATEX_OUTPUT_PATH:PATH=${CMAKE_CURRENT_LIST_DIR}/flann-1.8.4 -DLATEX_OUTPUT_PATH:PATH=build "-DCMAKE_INSTALL_PREFIX:PATH=${TPL_LOCAL_INSTALL}" diff --git a/TPL/flann-1.8.4/CMakeLists.txt b/TPL/flann-1.8.4/CMakeLists.txt index 327991584..6a8780e32 100644 --- a/TPL/flann-1.8.4/CMakeLists.txt +++ b/TPL/flann-1.8.4/CMakeLists.txt @@ -54,6 +54,7 @@ option(BUILD_C_BINDINGS "Build C bindings" ON) option(BUILD_PYTHON_BINDINGS "Build Python bindings" ON) option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" ON) option(BUILD_CUDA_LIB "Build CUDA library" OFF) +option(BUILD_EXAMPLES "Build examples" ON) option(USE_OPENMP "Use OpenMP multi-threading" ON) option(USE_MPI "Use MPI" OFF) @@ -155,7 +156,11 @@ endif(WIN32) add_subdirectory( cmake ) add_subdirectory( src ) -add_subdirectory( examples ) + +if(BUILD_EXAMPLES) + add_subdirectory( examples ) +endif() + add_subdirectory( test ) add_subdirectory( doc ) diff --git a/TPL/flann-1.8.4/src/cpp/flann/util/serialization.h b/TPL/flann-1.8.4/src/cpp/flann/util/serialization.h index 885192b68..e871824ce 100644 --- a/TPL/flann-1.8.4/src/cpp/flann/util/serialization.h +++ b/TPL/flann-1.8.4/src/cpp/flann/util/serialization.h @@ -89,7 +89,9 @@ BASIC_TYPE_SERIALIZER(unsigned long); BASIC_TYPE_SERIALIZER(float); BASIC_TYPE_SERIALIZER(double); BASIC_TYPE_SERIALIZER(bool); - +#ifdef _MSC_VER +BASIC_TYPE_SERIALIZER(unsigned __int64); +#endif // serializer for std::vector From da8258e975a87cab2b452eac2945d3fa93739ad3 Mon Sep 17 00:00:00 2001 From: Matt Dawkins Date: Wed, 19 Jul 2017 13:57:44 -0700 Subject: [PATCH 2/8] Basic windows build support --- CMakeLists.txt | 4 ++++ TPL/CMakeLists.txt | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f2754fe3..d34ae02b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,10 @@ set(SMQTK_VERSION_MAJOR ${CMAKE_MATCH_1}) set(SMQTK_VERSION_MINOR ${CMAKE_MATCH_3}) set(SMQTK_VERSION_PATCH ${CMAKE_MATCH_5}) +### +# Options +# +option(SMQTK_BUILD_EXAMPLES "Enable building examples." ON) ### # Determine where to install python things in our install tree diff --git a/TPL/CMakeLists.txt b/TPL/CMakeLists.txt index d099ad24c..dc316c56b 100644 --- a/TPL/CMakeLists.txt +++ b/TPL/CMakeLists.txt @@ -3,7 +3,6 @@ include(ExternalProject) option(SMQTK_BUILD_LIBSVM "Enable building of libSVM." ON) option(SMQTK_BUILD_FLANN "Enable building of FLANN." ON) -option(SMQTK_BUILD_EXAMPLES "Enable building examples." ON) # Variables defined by parent module: # TPL_BUILD_PREFIX - Where build files will go From d993d2b4f1d6bcebfed58e7197cee83526a40d71 Mon Sep 17 00:00:00 2001 From: Matt Dawkins Date: Wed, 19 Jul 2017 14:07:38 -0700 Subject: [PATCH 3/8] Parameterize install script --- CMakeLists.txt | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d34ae02b6..0c2924179 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,8 @@ set(SMQTK_VERSION_PATCH ${CMAKE_MATCH_5}) # Options # option(SMQTK_BUILD_EXAMPLES "Enable building examples." ON) +option(SMQTK_INSTALL_SETUP_SCRIPT "Enable building examples." ON) +mark_as_advanced(SMQTK_INSTALL_SETUP_SCRIPT) ### # Determine where to install python things in our install tree @@ -62,14 +64,16 @@ add_subdirectory( src ) # File configuration # # Environment setup scripts -configure_file("${SMQTK_SOURCE_DIR}/setup_env.build.sh.in" - "${SMQTK_BINARY_DIR}/setup_env.build.sh" - @ONLY - ) -configure_file("${SMQTK_SOURCE_DIR}/setup_env.install.sh.in" - "${SMQTK_BINARY_DIR}/setup_env.install.sh" - @ONLY - ) +if(SMQTK_INSTALL_SETUP_SCRIPT) + configure_file("${SMQTK_SOURCE_DIR}/setup_env.build.sh.in" + "${SMQTK_BINARY_DIR}/setup_env.build.sh" + @ONLY + ) + configure_file("${SMQTK_SOURCE_DIR}/setup_env.install.sh.in" + "${SMQTK_BINARY_DIR}/setup_env.install.sh" + @ONLY + ) +endif() ### @@ -80,10 +84,12 @@ install(DIRECTORY docs/ ) # Should only be required for users installing to a non-standard location -install(FILES "${SMQTK_BINARY_DIR}/setup_env.install.sh" - DESTINATION . - RENAME setup_smqtk.sh - ) +if(SMQTK_INSTALL_SETUP_SCRIPT) + install(FILES "${SMQTK_BINARY_DIR}/setup_env.install.sh" + DESTINATION . + RENAME setup_smqtk.sh + ) +endif() # This is probably not the correct way to be doing this, but when using CPack, # make sure the CMAKE_INSTALL_PREFIX is clean before constructing packages. If From 65d8f62934461aba56dc90c580c3185d30d6eaf6 Mon Sep 17 00:00:00 2001 From: Matt Dawkins Date: Thu, 20 Jul 2017 10:37:42 -0400 Subject: [PATCH 4/8] Add extra gitignores --- TPL/flann-1.8.4/.gitignore | 3 +++ TPL/flann-1.8.4/src/cpp/.gitignore | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 TPL/flann-1.8.4/.gitignore create mode 100644 TPL/flann-1.8.4/src/cpp/.gitignore diff --git a/TPL/flann-1.8.4/.gitignore b/TPL/flann-1.8.4/.gitignore new file mode 100644 index 000000000..3a2b70c59 --- /dev/null +++ b/TPL/flann-1.8.4/.gitignore @@ -0,0 +1,3 @@ +CMakeFiles +Makefile +cmake_install.cmake diff --git a/TPL/flann-1.8.4/src/cpp/.gitignore b/TPL/flann-1.8.4/src/cpp/.gitignore new file mode 100644 index 000000000..3a2b70c59 --- /dev/null +++ b/TPL/flann-1.8.4/src/cpp/.gitignore @@ -0,0 +1,3 @@ +CMakeFiles +Makefile +cmake_install.cmake From 497769fa1f14e6af89eeb55f9b6ae168638c8b7f Mon Sep 17 00:00:00 2001 From: David Hughes Date: Thu, 22 Feb 2018 10:37:12 -0500 Subject: [PATCH 5/8] Get libSVM to build on Windows --- TPL/CMakeLists.txt | 77 +++++++++++++++++++----------- TPL/libsvm-3.1-custom/Makefile.win | 2 +- 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/TPL/CMakeLists.txt b/TPL/CMakeLists.txt index 2922125f0..c61c84a38 100644 --- a/TPL/CMakeLists.txt +++ b/TPL/CMakeLists.txt @@ -10,42 +10,61 @@ option(SMQTK_BUILD_FLANN "Enable building of FLANN." ON) # TPL_PYTHON_SP - relative path of standarad Python site-packages dir -# Pick "make" executable based on generator chosen or environment variable -# set. -if (CMAKE_GENERATOR MATCHES ".*Makefiles") - set(MAKE_EXECUTABLE "$(MAKE)") -elseif(NOT "#@$ENV{MAKE}" STREQUAL "#@") - set(MAKE_EXECUTABLE $ENV{MAKE}) -else() - find_program(MAKE_EXECUTABLE make) -endif() - - ### # libSVM # if (SMQTK_BUILD_LIBSVM) - # Required a make command to build. Required its existance. - if( NOT MAKE_EXECUTABLE ) - message( FATAL_ERROR "Could not find 'make', required to build libsvm." ) - endif() set(libSVM_DIR "${CMAKE_CURRENT_LIST_DIR}/libsvm-3.1-custom") - ExternalProject_Add(libSVM - PREFIX "${TPL_BUILD_PREFIX}" - SOURCE_DIR "${libSVM_DIR}" - CONFIGURE_COMMAND "" - BUILD_IN_SOURCE 1 - BUILD_COMMAND ${MAKE_EXECUTABLE} lib - INSTALL_DIR "${TPL_LOCAL_INSTALL}" - INSTALL_COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/lib" - COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/include" - COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_PYTHON_SP}" - COMMAND "${CMAKE_COMMAND}" -E copy libsvm.so.2 "${TPL_LOCAL_INSTALL}/lib" - COMMAND "${CMAKE_COMMAND}" -E copy svm.h "${TPL_LOCAL_INSTALL}/include" - COMMAND "${CMAKE_COMMAND}" -E copy python/svm.py "${TPL_PYTHON_SP}" - COMMAND "${CMAKE_COMMAND}" -E copy python/svmutil.py "${TPL_PYTHON_SP}" + if(WIN32) + ExternalProject_Add(libSVM + PREFIX "${TPL_BUILD_PREFIX}" + SOURCE_DIR "${libSVM_DIR}" + CONFIGURE_COMMAND "" + BUILD_IN_SOURCE 1 + BUILD_COMMAND make -f Makefile.win lib + INSTALL_DIR "${TPL_LOCAL_INSTALL}" + INSTALL_COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/lib" + COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/include" + COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_PYTHON_SP}" + COMMAND "${CMAKE_COMMAND}" -E copy libsvm.lib "${TPL_LOCAL_INSTALL}/lib" + COMMAND "${CMAKE_COMMAND}" -E copy svm.h "${TPL_LOCAL_INSTALL}/include" + COMMAND "${CMAKE_COMMAND}" -E copy python/svm.py "${TPL_PYTHON_SP}" + COMMAND "${CMAKE_COMMAND}" -E copy python/svmutil.py "${TPL_PYTHON_SP}" ) + else() + # Required a make command to build. Required its existance. + # Pick "make" executable based on generator chosen or environment variable + # set. + if (CMAKE_GENERATOR MATCHES ".*Makefiles") + set(MAKE_EXECUTABLE "$(MAKE)") + elseif(NOT "#@$ENV{MAKE}" STREQUAL "#@") + set(MAKE_EXECUTABLE $ENV{MAKE}) + else() + find_program(MAKE_EXECUTABLE make) + endif() + + + if( NOT MAKE_EXECUTABLE ) + message( FATAL_ERROR "Could not find 'make', required to build libsvm." ) + endif() + + ExternalProject_Add(libSVM + PREFIX "${TPL_BUILD_PREFIX}" + SOURCE_DIR "${libSVM_DIR}" + CONFIGURE_COMMAND "" + BUILD_IN_SOURCE 1 + BUILD_COMMAND ${MAKE_EXECUTABLE} lib + INSTALL_DIR "${TPL_LOCAL_INSTALL}" + INSTALL_COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/lib" + COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/include" + COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_PYTHON_SP}" + COMMAND "${CMAKE_COMMAND}" -E copy libsvm.so.2 "${TPL_LOCAL_INSTALL}/lib" + COMMAND "${CMAKE_COMMAND}" -E copy svm.h "${TPL_LOCAL_INSTALL}/include" + COMMAND "${CMAKE_COMMAND}" -E copy python/svm.py "${TPL_PYTHON_SP}" + COMMAND "${CMAKE_COMMAND}" -E copy python/svmutil.py "${TPL_PYTHON_SP}" + ) + endif() endif() diff --git a/TPL/libsvm-3.1-custom/Makefile.win b/TPL/libsvm-3.1-custom/Makefile.win index 0db46f390..6913a5f5e 100644 --- a/TPL/libsvm-3.1-custom/Makefile.win +++ b/TPL/libsvm-3.1-custom/Makefile.win @@ -26,7 +26,7 @@ svm.obj: svm.cpp svm.h $(CXX) $(CFLAGS) -c svm.cpp lib: svm.cpp svm.h svm.def - $(CXX) $(CFLAGS) -LD svm.cpp -Fe$(TARGET)\libsvm -link -DEF:svm.def + $(CXX) $(CFLAGS) -LD svm.cpp -Felibsvm -link -DEF:svm.def clean: -erase /Q *.obj $(TARGET)\. From a8dea57d2a393c554ef97ae72446bb98d481bff9 Mon Sep 17 00:00:00 2001 From: David Hughes Date: Thu, 22 Feb 2018 10:50:44 -0500 Subject: [PATCH 6/8] Don't need two separate ExternalProject_Add --- TPL/CMakeLists.txt | 81 +++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 45 deletions(-) diff --git a/TPL/CMakeLists.txt b/TPL/CMakeLists.txt index c61c84a38..61fecf0d6 100644 --- a/TPL/CMakeLists.txt +++ b/TPL/CMakeLists.txt @@ -15,56 +15,47 @@ option(SMQTK_BUILD_FLANN "Enable building of FLANN." ON) # if (SMQTK_BUILD_LIBSVM) - set(libSVM_DIR "${CMAKE_CURRENT_LIST_DIR}/libsvm-3.1-custom") - if(WIN32) - ExternalProject_Add(libSVM - PREFIX "${TPL_BUILD_PREFIX}" - SOURCE_DIR "${libSVM_DIR}" - CONFIGURE_COMMAND "" - BUILD_IN_SOURCE 1 - BUILD_COMMAND make -f Makefile.win lib - INSTALL_DIR "${TPL_LOCAL_INSTALL}" - INSTALL_COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/lib" - COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/include" - COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_PYTHON_SP}" - COMMAND "${CMAKE_COMMAND}" -E copy libsvm.lib "${TPL_LOCAL_INSTALL}/lib" - COMMAND "${CMAKE_COMMAND}" -E copy svm.h "${TPL_LOCAL_INSTALL}/include" - COMMAND "${CMAKE_COMMAND}" -E copy python/svm.py "${TPL_PYTHON_SP}" - COMMAND "${CMAKE_COMMAND}" -E copy python/svmutil.py "${TPL_PYTHON_SP}" - ) + # Required a make command to build. Required its existance. + # Pick "make" executable based on generator chosen or environment variable + # set. + if (CMAKE_GENERATOR MATCHES ".*Makefiles") + set(MAKE_EXECUTABLE "$(MAKE)") + elseif(WIN32) + set(MAKE_EXECUTABLE nmake -f Makefile.win) + elseif(NOT "#@$ENV{MAKE}" STREQUAL "#@") + set(MAKE_EXECUTABLE $ENV{MAKE}) else() - # Required a make command to build. Required its existance. - # Pick "make" executable based on generator chosen or environment variable - # set. - if (CMAKE_GENERATOR MATCHES ".*Makefiles") - set(MAKE_EXECUTABLE "$(MAKE)") - elseif(NOT "#@$ENV{MAKE}" STREQUAL "#@") - set(MAKE_EXECUTABLE $ENV{MAKE}) - else() - find_program(MAKE_EXECUTABLE make) - endif() + find_program(MAKE_EXECUTABLE make) + endif() + # Set the libsvm we want. Can't just use a suffix, since linux uses *.so.2 + if(WIN32) + set(LIBSVM_NAME libsvm.lib) + else() + set(LIBSVM_NAME libsvm.so.2) + endif() - if( NOT MAKE_EXECUTABLE ) - message( FATAL_ERROR "Could not find 'make', required to build libsvm." ) - endif() - ExternalProject_Add(libSVM - PREFIX "${TPL_BUILD_PREFIX}" - SOURCE_DIR "${libSVM_DIR}" - CONFIGURE_COMMAND "" - BUILD_IN_SOURCE 1 - BUILD_COMMAND ${MAKE_EXECUTABLE} lib - INSTALL_DIR "${TPL_LOCAL_INSTALL}" - INSTALL_COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/lib" - COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/include" - COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_PYTHON_SP}" - COMMAND "${CMAKE_COMMAND}" -E copy libsvm.so.2 "${TPL_LOCAL_INSTALL}/lib" - COMMAND "${CMAKE_COMMAND}" -E copy svm.h "${TPL_LOCAL_INSTALL}/include" - COMMAND "${CMAKE_COMMAND}" -E copy python/svm.py "${TPL_PYTHON_SP}" - COMMAND "${CMAKE_COMMAND}" -E copy python/svmutil.py "${TPL_PYTHON_SP}" - ) + if( NOT MAKE_EXECUTABLE ) + message( FATAL_ERROR "Could not find 'make', required to build libsvm." ) endif() + + set(libSVM_DIR "${CMAKE_CURRENT_LIST_DIR}/libsvm-3.1-custom") + ExternalProject_Add(libSVM + PREFIX "${TPL_BUILD_PREFIX}" + SOURCE_DIR "${libSVM_DIR}" + CONFIGURE_COMMAND "" + BUILD_IN_SOURCE 1 + BUILD_COMMAND ${MAKE_EXECUTABLE} lib + INSTALL_DIR "${TPL_LOCAL_INSTALL}" + INSTALL_COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/lib" + COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_LOCAL_INSTALL}/include" + COMMAND "${CMAKE_COMMAND}" -E make_directory "${TPL_PYTHON_SP}" + COMMAND "${CMAKE_COMMAND}" -E copy ${LIBSVM_NAME} "${TPL_LOCAL_INSTALL}/lib" + COMMAND "${CMAKE_COMMAND}" -E copy svm.h "${TPL_LOCAL_INSTALL}/include" + COMMAND "${CMAKE_COMMAND}" -E copy python/svm.py "${TPL_PYTHON_SP}" + COMMAND "${CMAKE_COMMAND}" -E copy python/svmutil.py "${TPL_PYTHON_SP}" + ) endif() From 8b8d1c59f48ecbdd4447ab319cd0fdb85c9ec946 Mon Sep 17 00:00:00 2001 From: David Hughes Date: Fri, 23 Feb 2018 13:05:40 -0500 Subject: [PATCH 7/8] Added release note --- docs/release_notes/pending_release.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/release_notes/pending_release.md b/docs/release_notes/pending_release.md index d7be8c8a9..28cfdb84f 100644 --- a/docs/release_notes/pending_release.md +++ b/docs/release_notes/pending_release.md @@ -5,6 +5,9 @@ SMQTK Pending Release Notes Updates / New Features since v0.8.1 ----------------------------------- +libSVM + + * Can now build libSVM on Windows Fixes since v0.8.1 ------------------ From 484de9360457798d1a94c4acad981bd16c6b908d Mon Sep 17 00:00:00 2001 From: David Hughes Date: Sat, 24 Feb 2018 22:33:03 -0500 Subject: [PATCH 8/8] Switch lib to dll for windows libsvm --- TPL/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TPL/CMakeLists.txt b/TPL/CMakeLists.txt index 61fecf0d6..cb65b78e9 100644 --- a/TPL/CMakeLists.txt +++ b/TPL/CMakeLists.txt @@ -30,7 +30,7 @@ if (SMQTK_BUILD_LIBSVM) # Set the libsvm we want. Can't just use a suffix, since linux uses *.so.2 if(WIN32) - set(LIBSVM_NAME libsvm.lib) + set(LIBSVM_NAME libsvm.dll) else() set(LIBSVM_NAME libsvm.so.2) endif()