diff options
| author | JackLivio <jack@livio.io> | 2018-08-29 14:09:33 -0400 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2018-08-29 14:09:33 -0400 |
| commit | 47aa0561983a63eafc2a0ed2cf1b47f5c061b5fc (patch) | |
| tree | 6fbe63971f92d3f1baca53271bd975fb5891aee1 | |
| parent | cee3ba5cec980dcee4cc37af71bd09dc306d3867 (diff) | |
| download | sdl_core-47aa0561983a63eafc2a0ed2cf1b47f5c061b5fc.tar.gz | |
Fix merge conflict
| -rw-r--r-- | src/3rd_party/CMakeLists.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt index 05ad0771c8..bdb96de417 100644 --- a/src/3rd_party/CMakeLists.txt +++ b/src/3rd_party/CMakeLists.txt @@ -209,12 +209,7 @@ else() ) endif() -<<<<<<< HEAD - -find_package(Boost 1.66.0 COMPONENTS system thread filesystem) -======= -find_package(Boost 1.66.0 COMPONENTS system thread date_time) ->>>>>>> origin/develop +find_package(Boost 1.66.0 COMPONENTS system thread date_time filesystem) set(BOOST_LIB_SOURCE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/boost_src) set(BOOST_LIBS_DIRECTORY ${3RD_PARTY_INSTALL_PREFIX}/lib) SET_PROPERTY(GLOBAL PROPERTY GLOBAL_BOOST_LIBS ${BOOST_LIBS_DIRECTORY}) |