Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
CGoGN
CGoGN
Commits
0b676145
Commit
0b676145
authored
Sep 19, 2014
by
Thery Sylvain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
resolve dylib mac compilation pb
parent
6e701b3d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
CMakeLists.txt
CMakeLists.txt
+9
-5
No files found.
CMakeLists.txt
View file @
0b676145
...
...
@@ -144,7 +144,7 @@ IF (WITH_QT)
find_package
(
QGLViewer REQUIRED
)
SET
(
CGoGN_EXT_INCLUDES
${
CGoGN_EXT_INCLUDES
}
${
QT_INCLUDE_DIR
}
${
QGLVIEWER_INCLUDE_DIR
}
)
SET
(
CGoGN_EXT_LIBS
${
QGLVIEWER_LIBRARIES
}
${
QT_LIBRARIES
}
${
CGoGN_EXT_LIBS
}
)
MESSAGE
(
"LIBS="
${
CGoGN_EXT_LIBS
}
)
ENDIF
(
WITH_QT
)
IF
(
WITH_GLEWMX
)
...
...
@@ -286,22 +286,26 @@ file( GLOB_RECURSE
${
CGoGN_ROOT_DIR
}
/ThirdParty/include/*.hpp
)
link_directories
(
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
IF
(
ONELIB
)
IF
(
WITH_QT
)
add_library
(
cgogn
${
files_topology
}
${
files_container
}
${
files_algo
}
${
files_utils_withQt
}
)
ELSE
()
add_library
(
cgogn
${
files_topology
}
${
files_container
}
${
files_algo
}
${
files_utils
}
)
ENDIF
()
add_dependencies
(
cgogn shader_target
)
add_dependencies
(
cgogn shader_target
)
target_link_libraries
(
cgogn
${
CGoGN_EXT_LIBS
}
)
ELSE
()
add_library
(
container
${
files_container
}
)
add_library
(
topology
${
files_topology
}
)
add_library
(
algo
${
files_algo
}
)
IF
(
WITH_QT
)
add_library
(
utils
${
files_utils_withQt
}
)
ELSE
()
add_library
(
utils
${
files_utils
}
)
ENDIF
()
add_library
(
container
${
files_container
}
)
add_library
(
topology
${
files_topology
}
)
add_library
(
algo
${
files_algo
}
)
add_custom_target
(
Geometry SOURCES
${
files_geometry
}
)
add_custom_target
(
ThirdParty SOURCES
${
files_thirdParty
}
)
add_dependencies
(
utils shader_target
)
...
...
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