Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Game Library
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Onuralp SEZER
Game Library
Commits
5a2a9b3c
Commit
5a2a9b3c
authored
2 years ago
by
Joseph Walton-Rivers
Browse files
Options
Downloads
Patches
Plain Diff
remove defunct conan variable
parent
e50c546d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+0
-8
0 additions, 8 deletions
CMakeLists.txt
cmake/conan-wrangler.cmake
+0
-65
0 additions, 65 deletions
cmake/conan-wrangler.cmake
with
0 additions
and
73 deletions
CMakeLists.txt
+
0
−
8
View file @
5a2a9b3c
...
...
@@ -4,13 +4,10 @@ set(namespace "fggl")
set
(
CMAKE_CXX_STANDARD 20
)
set
(
CMAKE_CXX_STANDARD_REQUIRED YES
)
option
(
FGGL_CONAN
"Should we use conan to find missing dependencies?"
OFF
)
option
(
FGGL_EXAMPLES
"Should we build examples or just the library"
ON
)
option
(
FGGL_TESTS
"Should we enable the testing suite?"
ON
)
option
(
FGGL_DOCS
"Should we build documentation?"
ON
)
set
(
CONAN_BUILD_TYPE
"Debug"
)
if
(
DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE
)
set
(
CMAKE_TOOLCHAIN_FILE
"$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
CACHE STRING
""
)
...
...
@@ -26,10 +23,6 @@ project(fggl
include
(
GNUInstallDirs
)
if
(
CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME
)
# slightly cleaner conan support
include
(
cmake/conan-wrangler.cmake
)
# testing support
include
(
CTest
)
...
...
@@ -45,7 +38,6 @@ if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
endif
()
set
(
CMAKE_EXPORT_COMPILE_COMMANDS ON
)
...
...
This diff is collapsed.
Click to expand it.
cmake/conan-wrangler.cmake
deleted
100644 → 0
+
0
−
65
View file @
e50c546d
##
# Conan Wranger
# Integrate Conan when needed, don't bother when it's not
##
if
(
FGGL_CONAN
)
if
(
CONAN_EXPORTED
)
include
(
${
CMAKE_BINARY_DIR
}
/conanbuildinfo.cmake
)
conan_basic_setup
()
else
()
list
(
APPEND CMAKE_MODULE_PATH
${
CMAKE_BINARY_DIR
}
)
list
(
APPEND CMAKE_PREFIX_PATH
${
CMAKE_BINARY_DIR
}
)
# download conan if not available
if
(
NOT EXISTS
"
${
CMAKE_BINARY_DIR
}
/conan.cmake"
)
message
(
STATUS
"Downloading conan.cmake from https://github.com/conan-io/cmake-conan"
)
file
(
DOWNLOAD
"https://raw.githubusercontent.com/conan-io/cmake-conan/master/conan.cmake"
"
${
CMAKE_BINARY_DIR
}
/conan.cmake"
)
endif
()
# download and enable dependencies
include
(
${
CMAKE_BINARY_DIR
}
/conan.cmake
)
conan_cmake_configure
(
REQUIRES
opengl/system
openal/1.21.1
assimp/5.2.2
glfw/3.3.7
glad/0.1.35
glm/0.9.9.8
spdlog/1.10.0
freetype/2.11.1
bullet3/3.22a
yaml-cpp/0.7.0
GENERATORS
cmake_find_package
cmake_find_package_multi
OPTIONS
glfw:shared=True
glad:gl_profile=core
glad:gl_version=4.5
glad:extensions=
"GL_ARB_get_program_binary,GL_ARB_shading_language_include"
BASIC_SETUP
)
if
(
CMAKE_CONFIGURATION_TYPES
)
foreach
(
TYPE
${
CMAKE_CONFIGURATION_TYPES
}
)
conan_cmake_autodetect
(
settings BUILD_TYPE
${
TYPE
}
)
conan_cmake_install
(
PATH_OR_REFERENCE .
BUILD missing
SETTINGS
${
settings
}
)
endforeach
()
else
()
conan_cmake_autodetect
(
settings BUILD_TYPE
${
TYPE
}
)
conan_cmake_install
(
PATH_OR_REFERENCE .
BUILD missing
SETTINGS
${
settings
}
)
endif
()
endif
()
endif
()
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment