Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
bfc5ff9b
Commit
bfc5ff9b
authored
Aug 09, 2010
by
Alexander Wiebel
Browse files
[MERGE]
parents
604b5feb
470f5427
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
src/CMakeLists.txt
src/CMakeLists.txt
+6
-1
src/modules/homeGlyphs/CMakeLists.txt
src/modules/homeGlyphs/CMakeLists.txt
+1
-1
No files found.
src/CMakeLists.txt
View file @
bfc5ff9b
...
...
@@ -91,7 +91,12 @@ ELSE()
ENDIF
()
# some modules need the teem library (http://teem.sourceforge.net/)
find_package
(
Teem PATHS /usr/local/lib QUIET
)
find_package
(
Teem PATHS /usr/local/lib /opt/teem/lib QUIET
)
IF
(
Teem_FOUND
)
# we need to add the include path and lib path to allow the compiler and linker to find teem even if it was not installed to
# /usr/local
INCLUDE_DIRECTORIES
(
${
Teem_INCLUDE_DIRS
}
)
LINK_DIRECTORIES
(
${
LINK_DIRECTORIES
}
${
Teem_LIBRARY_DIRS
}
)
ENDIF
()
# other options:
#---------------
...
...
src/modules/homeGlyphs/CMakeLists.txt
View file @
bfc5ff9b
...
...
@@ -10,7 +10,7 @@ SET( MODULE_NAME "OWmodule_${MODULE_NAME}" ) # prefix all module names w
# Build module lib
ADD_LIBRARY
(
${
MODULE_NAME
}
SHARED
${
MODULES_SRC
}
)
TARGET_LINK_LIBRARIES
(
${
MODULE_NAME
}
OWkernel
teem
)
TARGET_LINK_LIBRARIES
(
${
MODULE_NAME
}
OWkernel
${
Teem_LIBRARIES
}
)
# Copy local shaders to module target directory
IF
(
OW_COPY_SHADERS AND EXISTS
${
CMAKE_CURRENT_SOURCE_DIR
}
/shaders
)
# copy shaders only if the user wants it
...
...
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