Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
ImageINSA_Tanguy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tanguy.Raufflet
ImageINSA_Tanguy
Commits
f43d6b3e
Commit
f43d6b3e
authored
10 years ago
by
Antoine Lorence
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] Improvements in dependency lookup
parent
52d4ebfb
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
app/CMakeLists.txt
+6
-1
6 additions, 1 deletion
app/CMakeLists.txt
lib/detiq-t
+1
-1
1 addition, 1 deletion
lib/detiq-t
with
8 additions
and
3 deletions
CMakeLists.txt
+
1
−
1
View file @
f43d6b3e
...
@@ -12,7 +12,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
...
@@ -12,7 +12,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
# Detiq-T is a submodule, it is built automatically before building eiimage
# Detiq-T is a submodule, it is built automatically before building eiimage
if
(
EXISTS
${
CMAKE_CURRENT_SOURCE_DIR
}
/lib/detiq-t AND IS_DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/lib/detiq-t
)
if
(
EXISTS
${
CMAKE_CURRENT_SOURCE_DIR
}
/lib/detiq-t AND IS_DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/lib/detiq-t
)
add_subdirectory
(
lib/detiq-t
)
add_subdirectory
(
lib/detiq-t
)
include_directories
(
lib/detiq-t/ImageIn lib/detiq-t/GenericInterface
)
include_directories
(
lib/detiq-t/ImageIn lib/detiq-t/GenericInterface
)
else
()
else
()
message
(
FATAL_ERROR
"The Detiq-T project should be cloned before excuting this compilation. "
message
(
FATAL_ERROR
"The Detiq-T project should be cloned before excuting this compilation. "
"Please use 'git submodule init' and 'git submodule update' to automatically get the source "
"Please use 'git submodule init' and 'git submodule update' to automatically get the source "
...
...
This diff is collapsed.
Click to expand it.
app/CMakeLists.txt
+
6
−
1
View file @
f43d6b3e
...
@@ -17,7 +17,12 @@ endif()
...
@@ -17,7 +17,12 @@ endif()
# Find Qwt, which must be built and installed before running this compilation
# Find Qwt, which must be built and installed before running this compilation
find_package
(
Qwt 6.0 REQUIRED
)
find_package
(
Qwt 6.0 REQUIRED
)
include_directories
(
${
QWT_INCLUDE_DIRS
}
)
if
(
QWT_FOUND
)
message
(
STATUS
"Qwt library version
${
QWT_VERSION_STRING
}
"
)
include_directories
(
${
QWT_INCLUDE_DIRS
}
)
else
()
message
(
FATAL_ERROR
"Cannot find Qwt library. Please add the Qwt library directory to CMAKE_PREFIX_PATH."
)
endif
()
set
(
eiimage_SOURCES
set
(
eiimage_SOURCES
main.cpp
main.cpp
...
...
This diff is collapsed.
Click to expand it.
detiq-t
@
ac875e91
Compare
3775c10a
...
ac875e91
Subproject commit
3775c10a581cc3b5b8ad1bcb173a944d7dcae2d0
Subproject commit
ac875e918ae41dc00c6fede23711986ca1af8a14
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