From 14c60945ca8cc61725359e9dde9ba05ae84dc8b9 Mon Sep 17 00:00:00 2001 From: Jinhao Date: Tue, 8 May 2018 05:05:39 +0800 Subject: [PATCH] fix CMakeLists error which is caused by merging --- CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bfcc110e..1fbeb363 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,16 +157,14 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") endif(NANA_CMAKE_SHARED_LIB) if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) - # GCC 4.9 + # GCC 4.9 list(APPEND NANA_LINKS "-lboost_system -lboost_thread") elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3) - # IS_GNUCXX < 5.3 + # IS_GNUCXX < 5.3 else() - - if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.3) list(APPEND NANA_LINKS -lstdc++fs) - endif() + endif() endif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") # AND NOT MINGW