nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix these rogue Boost issues

Browse Source
This commit is contained in:
BenCat07 2023-06-08 16:56:56 +02:00
parent 9622702d6c
commit f07858a4d7
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -24,4 +24,5 @@
url = https://github.com/nullworks/libnullnexus url = https://github.com/nullworks/libnullnexus
[submodule "external/boost-cmake"] [submodule "external/boost-cmake"]
path = external/boost-cmake path = external/boost-cmake
url = https://github.com/STEVE4git/boost-cmake.git url = https://github.com/STEVE4git/boost-cmake
branch = master

13
CMakeLists.txt
View File

@ -100,14 +100,11 @@ endif()
find_package(Git REQUIRED) find_package(Git REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/external") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/external")
find_package(SDL2 REQUIRED) find_package(SDL2 REQUIRED)
find_package(Boost 1.76.0 EXACT) set(BOOST_LIBS_OPTIONAL "" CACHE STRING "Boost libs to be compiled")
if (NOT ${Boost_FOUND}) add_subdirectory(external/boost-cmake)
set(BOOST_LIBS_OPTIONAL "" CACHE STRING "Boost libs to be compiled") set(BOOST_ROOT ${CMAKE_BINARY_DIR}/_deps/boost-src)
add_subdirectory(external/boost-cmake) find_package(Boost REQUIRED PATHS ${CMAKE_BINARY_DIR}/_deps/boost-src/tools/boost_install/ NO_DEFAULT_PATH)
SET (BOOST_ROOT ${CMAKE_BINARY_DIR}/_deps/boost-src) include_directories(${Boost_INCLUDE_DIRS})
find_package(Boost 1.76.5 EXACT)
include_directories(${Boost_INCLUDE_DIRS})
endif()
execute_process(COMMAND execute_process(COMMAND
"${GIT_EXECUTABLE}" log -1 --pretty=\"%h\" "${GIT_EXECUTABLE}" log -1 --pretty=\"%h\"

2
external/boost-cmake vendored

@ -1 +1 @@
Subproject commit 40cb41d86eab0d7fdc18af4b04b733f8cc852d2a Subproject commit 3c65b56be2e5bd8527b42fb8fbdcafae9c9c6c05