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
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
53965fa8
Commit
53965fa8
authored
Aug 28, 2013
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modification for suitesparse under Visual
parent
de5116d6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
5 deletions
+24
-5
CMakeLists.txt
CMakeLists.txt
+11
-3
apps_cmake.txt
apps_cmake.txt
+13
-2
No files found.
CMakeLists.txt
View file @
53965fa8
...
...
@@ -37,7 +37,6 @@ find_package(Boost COMPONENTS regex thread system REQUIRED)
find_package
(
ZLIB REQUIRED
)
find_package
(
LibXml2 REQUIRED
)
find_package
(
GLEW REQUIRED
)
#find_package(SuiteSparse REQUIRED)
IF
(
DEFINED ASSERTON
)
add_definitions
(
-DCGOGN_ASSERT_BOOL=
${
ASSERTON
}
)
...
...
@@ -91,10 +90,19 @@ SET (CGoGN_EXT_LIBS
${
Boost_THREAD_LIBRARY
}
)
IF
(
NOT WIN32
)
IF
(
WIN32
)
SET
(
CGoGN_EXT_INCLUDES
${
CGoGN_EXT_INCLUDES
}
${
CGoGN_ROOT_DIR
}
/windows_dependencies/include/suitesparse
)
SET
(
CGoGN_EXT_LIBS
${
CGoGN_EXT_LIBS
}
${
CGoGN_ROOT_DIR
}
/windows_dependencies/lib/suitesparse.lib
${
CGoGN_ROOT_DIR
}
/windows_dependencies/lib/metis.lib
${
CGoGN_ROOT_DIR
}
/windows_dependencies/lib/liblapack.lib
${
CGoGN_ROOT_DIR
}
/windows_dependencies/lib/libblas.lib
)
ELSE
(
WIN32
)
find_package
(
SuiteSparse REQUIRED
)
SET
(
CGoGN_EXT_INCLUDES
${
CGoGN_EXT_INCLUDES
}
${
SUITESPARSE_INCLUDE_DIRS
}
)
SET
(
CGoGN_EXT_LIBS
${
CGoGN_EXT_LIBS
}
${
SUITESPARSE_LIBRARIES
}
)
ENDIF
(
NOT WIN32
)
ENDIF
(
WIN32
)
#optionnal libs
IF
(
WITH_ASSIMP
)
...
...
apps_cmake.txt
View file @
53965fa8
...
...
@@ -32,7 +32,6 @@ find_package(Boost COMPONENTS regex thread system REQUIRED)
find_package(ZLIB REQUIRED)
find_package(LibXml2 REQUIRED)
find_package(GLEW REQUIRED)
find_package(SuiteSparse REQUIRED)
IF (DEFINED ASSERTON)
add_definitions(-DCGOGN_ASSERT_BOOL=${ASSERTON})
...
...
@@ -62,9 +61,21 @@ SET (COMMON_LIBS
${Boost_SYSTEM_LIBRARY}
${Boost_REGEX_LIBRARY}
${Boost_THREAD_LIBRARY}
${SUITESPARSE_LIBRARIES}
)
IF(WIN32)
SET (COMMON_INCLUDES ${COMMON_INCLUDES} ${CGoGN_ROOT_DIR}/windows_dependencies/include/suitesparse)
SET (COMMON_LIBS ${COMMON_LIBS}
${CGoGN_ROOT_DIR}/windows_dependencies/lib/suitesparse.lib
${CGoGN_ROOT_DIR}/windows_dependencies/lib/metis.lib
${CGoGN_ROOT_DIR}/windows_dependencies/lib/liblapack.lib
${CGoGN_ROOT_DIR}/windows_dependencies/lib/libblas.lib )
ELSE(WIN32)
find_package(SuiteSparse REQUIRED)
SET (COMMON_INCLUDES ${COMMON_INCLUDES} ${SUITESPARSE_INCLUDE_DIRS})
SET (COMMON_LIBS ${COMMON_LIBS} ${SUITESPARSE_LIBRARIES})
ENDIF(WIN32)
#optionnal libs
IF (WITH_ASSIMP)
add_definitions(-DWITH_ASSIMP)
...
...
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