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
Etienne Schmitt
CGoGN
Commits
2c1e4b36
Commit
2c1e4b36
authored
Jul 31, 2014
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug apps_cmake + pb on FindSuiteSparse on some distrib
parent
350e8781
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
9 deletions
+16
-9
.gitignore
.gitignore
+4
-1
ThirdParty/OpenNL/CMakeModules/FindSuiteSparse.cmake
ThirdParty/OpenNL/CMakeModules/FindSuiteSparse.cmake
+2
-1
apps_cmake.txt
apps_cmake.txt
+9
-7
cmake_modules/FindSuiteSparse.cmake
cmake_modules/FindSuiteSparse.cmake
+1
-0
No files found.
.gitignore
View file @
2c1e4b36
# ignore QtCreator files
CMakeLists.txt.user
\ No newline at end of file
CMakeLists.txt.user
bin/
ThirdParty/bin/
SCHNApps/bin
\ No newline at end of file
ThirdParty/OpenNL/CMakeModules/FindSuiteSparse.cmake
View file @
2c1e4b36
...
...
@@ -58,8 +58,9 @@ else( WIN32 )
FIND_PATH
(
SUITESPARSE_LIBRARY_DIR
NAMES libcholmod.so libcholmod.a
PATHS /usr/lib
/usr/lib64
/usr/lib64
/usr/lib/x86_64-linux-gnu
/usr/lib/i386-linux-gnu
/usr/local/lib
)
ENDIF
(
APPLE
)
...
...
apps_cmake.txt
View file @
2c1e4b36
...
...
@@ -130,6 +130,14 @@ ELSE()
ENDIF()
IF(NOT CMAKE_BUILD_TYPE)
IF (${CMAKE_CURRENT_BINARY_DIR} MATCHES "(.*)Debug|(.*)debug")
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
ELSE()
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
ENDIF()
ENDIF()
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
IF(WIN32)
...
...
@@ -140,10 +148,4 @@ ELSE ()
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
ENDIF ()
IF(NOT CMAKE_BUILD_TYPE)
IF (${CMAKE_CURRENT_BINARY_DIR} MATCHES "(.*)Debug|(.*)debug")
set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
ELSE()
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
ENDIF()
ENDIF()
cmake_modules/FindSuiteSparse.cmake
View file @
2c1e4b36
...
...
@@ -60,6 +60,7 @@ else( WIN32 )
PATHS /usr/lib
/usr/lib64
/usr/lib/x86_64-linux-gnu
/usr/lib/i386-linux-gnu
/usr/local/lib
)
ENDIF
(
APPLE
)
...
...
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