Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Thomas Pitiot
CGoGN
Commits
bd1a7b31
Commit
bd1a7b31
authored
Jan 31, 2011
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build independant de ThirdParty
parent
fc424142
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
7 deletions
+18
-7
ThirdParty/CMakeLists.txt
ThirdParty/CMakeLists.txt
+16
-5
build/CMakeLists.txt
build/CMakeLists.txt
+2
-2
No files found.
ThirdParty/CMakeLists.txt
View file @
bd1a7b31
cmake_minimum_required
(
VERSION 2.6
)
#include(ExternalProject)
project
(
CGoGN_ThirdParty
)
SET
(
CGoGN_ROOT_DIR
${
CMAKE_SOURCE_DIR
}
/..
)
find_package
(
OpenGL
)
find_package
(
GLUT
)
#On Windows we use AntTweakBar/OpenCTM of dependencies, not compiled
IF
(
WIN32
)
SUBDIRS
(
Zinri/Build gzstream/Build Numerical
)
add_subdirectory
(
Zinri/Build
)
add_subdirectory
(
gzstream/Build
)
add_subdirectory
(
Numerical
)
add_subdirectory
(
Assimp
)
ELSE
(
WIN32
)
add_custom_target
(
FakeTargetOpenCTM ALL
"make"
WORKING_DIRECTORY
${
CGoGN_ROOT_DIR
}
/ThirdParty/OpenCTM
COMMENT
"Custom compile of OpenCTM"
)
SUBDIRS
(
Zinri/Build gzstream/Build AntTweakBar Numerical Assimp/code
)
add_subdirectory
(
Zinri/Build
)
add_subdirectory
(
gzstream/Build
)
add_subdirectory
(
AntTweakBar
)
add_subdirectory
(
Numerical
)
add_subdirectory
(
Assimp
)
ENDIF
(
WIN32
)
build/CMakeLists.txt
View file @
bd1a7b31
...
...
@@ -26,7 +26,7 @@ IF(WIN32)
SET
(
LIBXML2_LIBRARIES xml2
)
INCLUDE_DIRECTORIES
(
${
CMAKE_BINARY_DIR
}
/dependencies/include/
)
LINK_DIRECTORIES
(
${
CMAKE_BINARY_DIR
}
/dependencies/lib/
)
add_subdirectory
(
${
CGoGN_ROOT_DIR
}
/ThirdParty ThirdParty
)
#
add_subdirectory(${CGoGN_ROOT_DIR}/ThirdParty ThirdParty)
add_subdirectory
(
Release
)
add_subdirectory
(
${
CGoGN_ROOT_DIR
}
/Apps Apps
)
if
(
EXISTS
"
${
CGoGN_ROOT_DIR
}
/Perso"
)
...
...
@@ -43,7 +43,7 @@ ELSE(WIN32)
ELSE
(
IL_LIBRARIES
)
SET
(
DEVIL_LIBRARIES
${
IL_LIBRARY
}
${
ILU_LIBRARY
}
${
ILUT_LIBRARY
}
)
ENDIF
(
IL_LIBRARIES
)
add_subdirectory
(
${
CGoGN_ROOT_DIR
}
/ThirdParty ThirdParty
)
#
add_subdirectory(${CGoGN_ROOT_DIR}/ThirdParty ThirdParty)
add_subdirectory
(
Release
)
add_subdirectory
(
Debug
)
add_subdirectory
(
${
CGoGN_ROOT_DIR
}
/Apps Apps
)
...
...
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