Merge pull request #17 from leoisl/boost_root

Refactoring BOOST search in CMake

.github/workflows/build.yaml

@@ -67,13 +67,9 @@ jobs:
       - name: Build and test
         run: |         
           # set up some variables so that CMake can find boost
-          export BOOST_INCLUDE_DIR="/usr/local/opt/[email protected]/include"
-          export BOOST_LIBRARY_DIR="/usr/local/opt/[email protected]/lib"
-          export CXXFLAGS="-DUSE_BOOST -I${BOOST_INCLUDE_DIR} -L${BOOST_LIBRARY_DIR}"
-          export LDFLAGS="-L${BOOST_LIBRARY_DIR} -lboost_filesystem -lboost_system"
-          
+          export BOOST_ROOT="/usr/local/opt/[email protected]"        
           mkdir build
           cd build
-          cmake -DBOOST=1 -DNOOPENMP=1 -DSKIP_PYTHON=1 ..
+          cmake -DNOOPENMP=1 -DSKIP_PYTHON=1 ..
           make
           make test

CMakeLists.txt

@@ -176,14 +176,10 @@ set(COBS_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} ${COBS_INCLUDE_DIRS})
 set(COBS_LINK_LIBRARIES ${ZLIB_LIBRARIES} ${COBS_LINK_LIBRARIES})
 
 ### check if we should use BOOST ###
-if(BOOST)
-  if(DEFINED ENV{BOOST_INCLUDE_DIR} AND DEFINED ENV{BOOST_LIBRARY_DIR})
-    message(WARNING "NOT FINDING BOOST THROUGH CMAKE, USING ENV VARIABLES!")
-  else()
-    find_package(Boost 1.72.0 COMPONENTS system filesystem)
-    set(COBS_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${COBS_INCLUDE_DIRS})
-    set(COBS_LINK_LIBRARIES ${Boost_LIBRARIES} ${COBS_LINK_LIBRARIES})
-  endif()
+find_package(Boost 1.72.0 COMPONENTS system filesystem)
+if(BOOST_FOUND)
+  set(COBS_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${COBS_INCLUDE_DIRS})
+  set(COBS_LINK_LIBRARIES ${Boost_LIBRARIES} ${COBS_LINK_LIBRARIES})
   add_compile_definitions(COBS_USE_BOOST)
 else()
   set(COBS_LINK_LIBRARIES stdc++fs ${COBS_LINK_LIBRARIES})