Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Project_Phoenix
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LuFG VR VIS
VR-Group
Project_Phoenix
Commits
cac85271
Commit
cac85271
authored
Oct 17, 2017
by
jwendt
Browse files
Options
Downloads
Patches
Plain Diff
Removed superfluous debug cmake messages
closes #170
parent
9c39b4e0
No related branches found
No related tags found
2 merge requests
!50
Release v17.10.0
,
!46
Feature/#58 do conan install in cmake
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/cpplint.cmake
+5
-6
5 additions, 6 deletions
cmake/cpplint.cmake
with
5 additions
and
6 deletions
cmake/cpplint.cmake
+
5
−
6
View file @
cac85271
...
@@ -35,26 +35,25 @@ endif()
...
@@ -35,26 +35,25 @@ endif()
set
(
CONAN_CPPLINT_DIR
)
set
(
CONAN_CPPLINT_DIR
)
if
(
TARGET CONAN_PKG::cpplint
)
if
(
TARGET CONAN_PKG::cpplint
)
# TODO(@tvierjahn) think about a better way of getting the cpplint directory
#message(STATUS "cpplint conan pkg exists")
message
(
STATUS
"cpplint conan pkg exists"
)
get_property
(
CONAN_CPPLINT_DIR
get_property
(
CONAN_CPPLINT_DIR
TARGET CONAN_PKG::cpplint
TARGET CONAN_PKG::cpplint
PROPERTY INTERFACE_INCLUDE_DIRECTORIES
PROPERTY INTERFACE_INCLUDE_DIRECTORIES
)
)
message
(
STATUS
"Direct CONAN_CPPLINT_DIR:
${
CONAN_CPPLINT_DIR
}
"
)
#
message(STATUS "Direct CONAN_CPPLINT_DIR: ${CONAN_CPPLINT_DIR}")
#This path might contain generator expressions, which we do not need here
#This path might contain generator expressions, which we do not need here
if
(
CONAN_INCLUDE_DIRS_CPPLINT_RELEASE
)
if
(
CONAN_INCLUDE_DIRS_CPPLINT_RELEASE
)
#this path is set in a multi config configuration, where CONAN_CPPLINT_DIR would contain generator expressions
#this path is set in a multi config configuration, where CONAN_CPPLINT_DIR would contain generator expressions
set
(
CONAN_CPPLINT_DIR
${
CONAN_INCLUDE_DIRS_CPPLINT_RELEASE
}
)
set
(
CONAN_CPPLINT_DIR
${
CONAN_INCLUDE_DIRS_CPPLINT_RELEASE
}
)
message
(
STATUS
"use CONAN_INCLUDE_DIRS_CPPLINT_RELEASE, since it exists as
${
CONAN_INCLUDE_DIRS_CPPLINT_RELEASE
}
"
)
#
message(STATUS "use CONAN_INCLUDE_DIRS_CPPLINT_RELEASE, since it exists as ${CONAN_INCLUDE_DIRS_CPPLINT_RELEASE}")
endif
()
endif
()
if
(
CONAN_INCLUDE_DIRS_CPPLINT
)
if
(
CONAN_INCLUDE_DIRS_CPPLINT
)
#this path is set in a non-multi configuration, where CONAN_CPPLINT_DIR would contain generator expressions
#this path is set in a non-multi configuration, where CONAN_CPPLINT_DIR would contain generator expressions
set
(
CONAN_CPPLINT_DIR
${
CONAN_INCLUDE_DIRS_CPPLINT
}
)
set
(
CONAN_CPPLINT_DIR
${
CONAN_INCLUDE_DIRS_CPPLINT
}
)
message
(
STATUS
"use CONAN_INCLUDE_DIRS_CPPLINT, since it exists as
${
CONAN_INCLUDE_DIRS_CPPLINT
}
"
)
#
message(STATUS "use CONAN_INCLUDE_DIRS_CPPLINT, since it exists as ${CONAN_INCLUDE_DIRS_CPPLINT}")
endif
()
endif
()
message
(
STATUS
"CONAN_CPPLINT_DIR:
${
CONAN_CPPLINT_DIR
}
"
)
#
message(STATUS "CONAN_CPPLINT_DIR: ${CONAN_CPPLINT_DIR}")
if
(
EXISTS
"
${
CONAN_CPPLINT_DIR
}
/cpplint.py"
)
if
(
EXISTS
"
${
CONAN_CPPLINT_DIR
}
/cpplint.py"
)
set
(
CPPLINT_COMMAND
"
${
CONAN_CPPLINT_DIR
}
/cpplint.py"
)
set
(
CPPLINT_COMMAND
"
${
CONAN_CPPLINT_DIR
}
/cpplint.py"
)
else
()
else
()
...
...
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