Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
xtpcpp
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
Container Registry
Model registry
Operate
Environments
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
PAPPSO
xtpcpp
Commits
91bacd0e
Commit
91bacd0e
authored
4 years ago
by
Langella Olivier
Browse files
Options
Downloads
Patches
Plain Diff
fix PAPPSOms++ binary path filename
parent
a7937d07
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
CMakeStuff/modules/FindPappsomspp.cmake
+2
-2
2 additions, 2 deletions
CMakeStuff/modules/FindPappsomspp.cmake
CMakeStuff/toolchains/unix-toolchain.cmake
+1
-0
1 addition, 0 deletions
CMakeStuff/toolchains/unix-toolchain.cmake
with
3 additions
and
2 deletions
CMakeStuff/modules/FindPappsomspp.cmake
+
2
−
2
View file @
91bacd0e
...
...
@@ -7,7 +7,7 @@ FIND_PATH( PAPPSOMSPP_INCLUDE_DIR pappsomspp/types.h
PATH_SUFFIXES pappsomspp libpappsomspp ENV PATH
)
FIND_LIBRARY
(
PAPPSOMSPP_QT5_LIBRARY NAMES pappsomspp
-qt5
)
FIND_LIBRARY
(
PAPPSOMSPP_QT5_LIBRARY NAMES pappsomspp
)
IF
(
PAPPSOMSPP_INCLUDE_DIR AND PAPPSOMSPP_QT5_LIBRARY
)
mark_as_advanced
(
PAPPSOMSPP_INCLUDE_DIR
)
mark_as_advanced
(
PAPPSOMSPP_QT5_LIBRARY
)
...
...
@@ -31,7 +31,7 @@ IF (PAPPSOMSPP_QT5_FOUND)
FIND_LIBRARY
(
PAPPSOMSPP_WIDGET_QT5_LIBRARY NAMES pappsomspp-widget
-qt5
)
FIND_LIBRARY
(
PAPPSOMSPP_WIDGET_QT5_LIBRARY NAMES pappsomspp-widget
)
IF
(
PAPPSOMSPP_INCLUDE_DIR AND PAPPSOMSPP_WIDGET_QT5_LIBRARY
)
MESSAGE
(
STATUS
"XXXXXXXXXXXXX
${
PAPPSOMSPP_WIDGET_QT5_LIBRARY
}
XXXXXXXXXXXXXXX"
)
SET
(
PAPPSOMSPP_WIDGET_QT5_FOUND TRUE
)
...
...
This diff is collapsed.
Click to expand it.
CMakeStuff/toolchains/unix-toolchain.cmake
+
1
−
0
View file @
91bacd0e
...
...
@@ -9,6 +9,7 @@ find_package( Odsstream REQUIRED )
if
(
PAPPSOMSPP_QT5_FOUND
)
else
(
PAPPSOMSPP_QT5_FOUND
)
set
(
Pappsomspp_DIR
${
CMAKE_MODULE_PATH
}
)
find_package
(
Pappsomspp REQUIRED
)
endif
(
PAPPSOMSPP_QT5_FOUND
)
...
...
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