Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
a4bff888
Commit
a4bff888
authored
Nov 04, 2015
by
Jan Möbius
Browse files
Make PhySim and Comiso finder look for the Packages
parent
63f380a5
Changes
2
Hide whitespace changes
Inline
Side-by-side
cmake/FindCoMISo.cmake
View file @
a4bff888
...
...
@@ -12,11 +12,19 @@ IF (COMISO_INCLUDE_DIR)
SET
(
COMISO_FIND_QUIETLY TRUE
)
ENDIF
(
COMISO_INCLUDE_DIR
)
# search all lib directories in packages for OpenFlipper
file
(
GLOB _libdirs
"
${
CMAKE_SOURCE_DIR
}
/libs"
"
${
CMAKE_SOURCE_DIR
}
/Package-*/libs"
)
# Find CoMISo config file
FIND_PATH
(
COMISO_INCLUDE_DIR CoMISo/Config/config.hh
PATHS
"
${
CMAKE_SOURCE_DIR
}
"
"
${
CMAKE_SOURCE_DIR
}
/libs/"
"
${
_libdirs
}
"
"
${
CMAKE_SOURCE_DIR
}
/../"
)
if
(
COMISO_INCLUDE_DIR
)
...
...
cmake/FindPhySim.cmake
View file @
a4bff888
...
...
@@ -11,8 +11,17 @@ IF (PHYSIM_INCLUDE_DIRS)
SET
(
PHYSIM_FIND_QUIETLY TRUE
)
ENDIF
(
PHYSIM_INCLUDE_DIRS
)
# search all lib directories in packages for OpenFlipper
file
(
GLOB _libdirs
"
${
CMAKE_SOURCE_DIR
}
/libs"
"
${
CMAKE_SOURCE_DIR
}
/Package-*/libs"
)
FIND_PATH
(
PHYSIM_INCLUDE_DIRS PhySim/Config/PhySimDefines.hh
PATHS
"
${
CMAKE_SOURCE_DIR
}
/libs"
)
PATHS
"
${
_libdirs
}
"
"
${
CMAKE_SOURCE_DIR
}
/libs"
)
add_definitions
(
-DPHYSIMDLL -DUSEPHYSIM
)
...
...
Write
Preview
Supports
Markdown
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