Fix Linux build

6 years ago · 96d19e07ca
parent 33470cb5a2
commit 96d19e07ca
2 changed files with 4 additions and 3 deletions
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@ -218,8 +218,7 @@ target_link_libraries(components
    ${Boost_FILESYSTEM_LIBRARY}
    ${Boost_THREAD_LIBRARY}
    ${Boost_PROGRAM_OPTIONS_LIBRARY}
-	${Boost_IOSTREAMS_LIBRARY}
-	${Boost_ZLIB_LIBRARY}
+    ${Boost_IOSTREAMS_LIBRARY}
    ${OSG_LIBRARIES}
    ${OPENTHREADS_LIBRARIES}
    ${OSGPARTICLE_LIBRARIES}
@ -241,7 +240,8 @@ target_link_libraries(components

 if (WIN32)
    target_link_libraries(components
-    ${Boost_LOCALE_LIBRARY})
+    ${Boost_LOCALE_LIBRARY}
+    ${Boost_ZLIB_LIBRARY})
 endif()

 if (USE_QT)
--- a/extern/bsaopthash/hash.cpp
+++ b/extern/bsaopthash/hash.cpp
@ -31,6 +31,7 @@

 #include <cstdint>
 #include <algorithm>
+#include <cstring>

 #include "hash.hpp"