47 lines
2.4 KiB
Diff
47 lines
2.4 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 6fe6d81..b59555c 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -291,7 +291,7 @@ endif()
|
||
|
|
# ENSMALLEN_INCLUDE_DIR - include directory for ensmallen
|
||
|
|
# STB_IMAGE_INCLUDE_DIR - include directory for STB image library
|
||
|
|
# MATHJAX_ROOT - root of MathJax installation
|
||
|
|
-find_package(Armadillo "${ARMADILLO_VERSION}" REQUIRED)
|
||
|
|
+find_package(Armadillo CONFIG "${ARMADILLO_VERSION}" REQUIRED)
|
||
|
|
|
||
|
|
# Include directories for the previous dependencies.
|
||
|
|
set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${ARMADILLO_INCLUDE_DIRS})
|
||
|
|
@@ -388,8 +388,8 @@ if (NOT ENSMALLEN_FOUND)
|
||
|
|
"Successfully downloaded ensmallen into ${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/")
|
||
|
|
|
||
|
|
# Now we have to also ensure these header files get installed.
|
||
|
|
- install(DIRECTORY "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen_bits/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ensmallen_bits")
|
||
|
|
- install(FILES "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen.hpp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
|
||
|
|
+ #install(DIRECTORY "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen_bits/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/ensmallen_bits")
|
||
|
|
+ #install(FILES "${CMAKE_BINARY_DIR}/deps/${ENSMALLEN_INCLUDE_DIR}/include/ensmallen.hpp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
|
||
|
|
else ()
|
||
|
|
message(FATAL_ERROR "Problem unpacking ensmallen! Expected only one directory ensmallen-x.y.z/; found ${ENS_DIRECTORIES}. Try removing the directory ${CMAKE_BINARY_DIR}/deps and reconfiguring.")
|
||
|
|
endif ()
|
||
|
|
@@ -446,6 +446,7 @@ find_package(Boost "${BOOST_VERSION}"
|
||
|
|
REQUIRED
|
||
|
|
)
|
||
|
|
|
||
|
|
+if(0)
|
||
|
|
link_directories(${Boost_LIBRARY_DIRS})
|
||
|
|
|
||
|
|
# In Visual Studio, automatic linking is performed, so we don't need to worry
|
||
|
|
@@ -457,10 +458,12 @@ if (MSVC)
|
||
|
|
message("boost lib dirs ${Boost_LIBRARY_DIRS}")
|
||
|
|
set(Boost_LIBRARIES "")
|
||
|
|
endif ()
|
||
|
|
+endif()
|
||
|
|
|
||
|
|
+link_directories(${Boost_LIBRARIES})
|
||
|
|
set(MLPACK_INCLUDE_DIRS ${MLPACK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
|
||
|
|
set(MLPACK_LIBRARIES ${MLPACK_LIBRARIES} ${Boost_LIBRARIES})
|
||
|
|
-set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS})
|
||
|
|
+set(MLPACK_LIBRARY_DIRS ${MLPACK_LIBRARY_DIRS} ${Boost_LIBRARIES})
|
||
|
|
|
||
|
|
# For Boost testing framework (will have no effect on non-testing executables).
|
||
|
|
# This specifies to Boost that we are dynamically linking to the Boost test
|