Skip to content

Commit 27de355

Browse files
committed
Merge pull request cpp-netlib#365 from ruslo/boost.found
Boost_FOUND is always TRUE
2 parents ad049c3 + c6fc7ad commit 27de355

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

CMakeLists.txt

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,14 @@ endif()
7777

7878
message(STATUS "C++ Compiler ID: ${CMAKE_CXX_COMPILER_ID}")
7979
message(STATUS "C++ Flags: ${CMAKE_CXX_FLAGS} link flags: ${CMAKE_CXX_LINK_FLAGS}")
80-
if (Boost_FOUND)
81-
if (MSVC)
82-
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
83-
endif(MSVC)
84-
if (WIN32)
85-
add_definitions(-D_WIN32_WINNT=0x0501)
86-
endif(WIN32)
87-
include_directories(${Boost_INCLUDE_DIRS})
88-
endif(Boost_FOUND)
80+
81+
if (MSVC)
82+
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
83+
endif(MSVC)
84+
if (WIN32)
85+
add_definitions(-D_WIN32_WINNT=0x0501)
86+
endif(WIN32)
87+
include_directories(${Boost_INCLUDE_DIRS})
8988

9089
message(STATUS "CPP-NETLIB options selected:")
9190
message(STATUS " CPP-NETLIB_BUILD_SHARED_LIBS: ${CPP-NETLIB_BUILD_SHARED_LIBS}\t(Build cpp-netlib as shared libraries: OFF, ON)")

mime/test/CMakeLists.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ endif()
1313

1414
include_directories(${CPP-NETLIB_SOURCE_DIR}/mime/src)
1515

16-
if ( Boost_FOUND )
17-
add_executable ( mime-roundtrip mime-roundtrip.cpp )
18-
target_link_libraries ( mime-roundtrip )
19-
add_test ( mime-roundtrip mime-roundtrip )
20-
endif ()
21-
16+
add_executable ( mime-roundtrip mime-roundtrip.cpp )
17+
target_link_libraries ( mime-roundtrip )
18+
add_test ( mime-roundtrip mime-roundtrip )

0 commit comments

Comments
 (0)