Merge branch 'build' of https://github.com/Thunder07/PCSX2_rewrite into Thunder07-build

.travis.yml

@@ -9,6 +9,7 @@ matrix:
             - ubuntu-toolchain-r-test
           packages:
             - g++-7
+            - cmake
       env:
         - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
 
@@ -16,29 +17,11 @@ install: true
 
 before_script:
   - eval "${MATRIX_EVAL}"
-
-script:
+  - echo "CC test... `${CC} --verison`"
+  - echo "CXX test... `${CXX} --verison`"
   - mkdir -p build
   - cd build
-  - export BUILD_DIR=`pwd`
-  - echo $BUILD_DIR
 
-  # Install Boost headers (1.65.1)
-  - BOOST_URL="https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.gz"
-  - mkdir -p boost && cd boost && travis_retry wget --quiet -O - ${BOOST_URL} | tar --strip-components=1 -xz
-  - ./bootstrap.sh
-  - travis_wait 30 ./b2 -d0 -j 4
-  - export BOOST_ROOT=`pwd`
-  - cd $BUILD_DIR
-
-  # Install recent CMake (3.8.2)
-  - CMAKE_URL="https://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.tar.gz"
-  - mkdir -p cmake && cd cmake && travis_retry wget --quiet --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz
-  - export PATH=`pwd`:$PATH
-  - cd $BUILD_DIR
-
-  - echo $PATH
-  - cmake --version
-
-  - cmake -DBOOST_ROOT=${BOOST_ROOT} ..
-  - make -j 4
+script:
+  - cmake ..
+  - cmake --build .

external/CMakeLists.txt

@@ -2,15 +2,4 @@ cmake_minimum_required(VERSION 3.1)
 
 project(external CXX)
 
-set(Boost_USE_STATIC_LIBS OFF)
-set(Boost_USE_MULTITHREADED ON)
-set(Boost_USE_STATIC_RUNTIME OFF)
-
-#set(BOOST_ROOT "${CMAKE_SOURCE_DIR}/external/boost")
-#set(BOOST_ROOT "C:/Shared/Dev/Projects/boost_1_65_1")
-find_package(Boost REQUIRED COMPONENTS log filesystem)
-
-# Allow main projects to use 
-set(Boost_FOUND ${Boost_FOUND} PARENT_SCOPE)
-set(Boost_INCLUDE_DIRS "${Boost_INCLUDE_DIRS}" PARENT_SCOPE)
-set(Boost_LIBRARIES "${Boost_LIBRARIES}" PARENT_SCOPE)
+add_subdirectory(boost)

project/liborbum/CMakeLists.txt

@@ -145,14 +145,16 @@ target_compile_definitions(
 
 target_include_directories(
 	liborbum PUBLIC
-	"${Boost_INCLUDE_DIR}"
 	"${CMAKE_SOURCE_DIR}/project/liborbum/src"
 	"${CMAKE_SOURCE_DIR}/project/utilities/src"
 )
 
 target_link_libraries(
 	liborbum 
-	${Boost_LIBRARIES}
+	PUBLIC
+		Boost::boost
+		Boost::filesystem
+		Boost::log
 )
 
 install(