Merge pull request #149 from bitshares/jmj_cmake

Remove custom FindBoost.cmake
bitshares · Aug 20, 2019 · 1eebd3c · 1eebd3c
2 parents 71f5348 + 699238f
commit 1eebd3c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1,210 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,8 +26,6 @@ INCLUDE( SetupTargetMacros )
 INCLUDE(GetGitRevisionDescription)
 INCLUDE(CheckLibraryExists)
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/Legacy)
-
 get_git_head_revision(GIT_REFSPEC FC_GIT_REVISION_SHA)
 get_git_unix_timestamp(FC_GIT_REVISION_UNIX_TIMESTAMP)
 
@@ -138,7 +136,8 @@ IF( WIN32 )
   # iphlpapi.lib
 ENDIF(WIN32)
 
-FIND_PACKAGE(Boost CONFIG COMPONENTS ${BOOST_COMPONENTS})
+set(Boost_DIR "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/Boost")
+FIND_PACKAGE(Boost CONFIG COMPONENTS ${BOOST_COMPONENTS} )
 
 IF(NOT WIN32)
   MESSAGE(STATUS "Configuring fc to build on Unix/Apple")