Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Michaël Roynard
concepts-for-images
Commits
8bf81f8b
Commit
8bf81f8b
authored
Aug 23, 2018
by
Michaël Roynard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switch to a less intrusive conan/cmake integration
parent
e7d62d83
Pipeline
#3438
failed with stages
in 4 minutes and 25 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
9 deletions
+14
-9
.vscode/settings.json
.vscode/settings.json
+3
-1
CMakeLists.txt
CMakeLists.txt
+0
-3
conanfile.py
conanfile.py
+1
-1
include/CMakeLists.txt
include/CMakeLists.txt
+5
-1
test/CMakeLists.txt
test/CMakeLists.txt
+5
-3
No files found.
.vscode/settings.json
View file @
8bf81f8b
{}
\ No newline at end of file
{
"cmake.configureOnOpen"
:
false
}
\ No newline at end of file
CMakeLists.txt
View file @
8bf81f8b
...
...
@@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.8.2) # required for cxx_std_17
project
(
Concepts-For-Images VERSION 0.2 LANGUAGES CXX
)
include
(
${
CMAKE_BINARY_DIR
}
/conanbuildinfo.cmake
)
conan_basic_setup
(
TARGETS
)
SET
(
COMPILER_CLANG OFF
)
SET
(
COMPILER_GCC OFF
)
SET
(
COMPILER_ICC OFF
)
...
...
conanfile.py
View file @
8bf81f8b
...
...
@@ -7,7 +7,7 @@ class ConceptsForImages(ConanFile):
url
=
"https://gitlab.lrde.epita.fr/mroynard/concepts-for-images"
description
=
"Images concepts implementation in C++17."
settings
=
"os"
,
"compiler"
,
"arch"
,
"build_type"
,
"cppstd"
generators
=
"cmake"
generators
=
"cmake
_find_package
"
def
source
(
self
):
git
=
tools
.
Git
()
...
...
include/CMakeLists.txt
View file @
8bf81f8b
set
(
CMAKE_MODULE_PATH
${
CMAKE_BINARY_DIR
}
)
find_package
(
concepts-fundamentals REQUIRED
)
find_package
(
blackmagic REQUIRED
)
set
(
CONCEPTS-FOR-IMAGES_INCLUDE_DIR
"
${
PROJECT_SOURCE_DIR
}
/include"
)
add_library
(
Concepts-For-Images INTERFACE
)
target_compile_features
(
Concepts-For-Images INTERFACE cxx_std_17
)
target_include_directories
(
Concepts-For-Images INTERFACE
${
CONCEPTS-FOR-IMAGES_INCLUDE_DIR
}
)
target_link_libraries
(
Concepts-For-Images INTERFACE
CONAN_PKG
::blackmagic
CONAN_PKG
::concepts-fundamentals
)
target_link_libraries
(
Concepts-For-Images INTERFACE
blackmagic
::blackmagic
concepts-fundamentals
::concepts-fundamentals
)
target_compile_options
(
Concepts-For-Images INTERFACE -fconcepts
)
# Gcc experimental concept support
...
...
test/CMakeLists.txt
View file @
8bf81f8b
...
...
@@ -9,7 +9,7 @@ macro(add_unit_test Executable Source)
add_executable
(
test_
${
Executable
}
EXCLUDE_FROM_ALL
${
Source
}
)
add_test
(
NAME test_
${
Executable
}
COMMAND test_
${
Executable
}
WORKING_DIRECTORY
${
CMAKE_BINARY_DIR
}
/test
)
target_link_libraries
(
test_
${
Executable
}
PRIVATE Concepts-For-Images
CONAN_PKG
::gtest Threads::Threads
)
target_link_libraries
(
test_
${
Executable
}
PRIVATE Concepts-For-Images
gtest
::gtest Threads::Threads
)
target_include_directories
(
test_
${
Executable
}
PRIVATE
${
CMAKE_CURRENT_SOURCE_DIR
}
)
if
(
PLATFORM_UNIX AND COMPILER_CLANG
)
...
...
@@ -23,7 +23,9 @@ option(WITH_TESTS "Compile and run tests" ON)
# if(WITH_TESTS)
find_package
(
Threads REQUIRED
)
add_subdirectory
(
concepts-for-images
)
set
(
CMAKE_MODULE_PATH
${
CMAKE_BINARY_DIR
}
)
find_package
(
gtest REQUIRED
)
find_package
(
Threads REQUIRED
)
add_subdirectory
(
concepts-for-images
)
# endif(WITH_TESTS)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment