Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
KennethVanhoey
CGoGN
Commits
2c1e4b36
Commit
2c1e4b36
authored
Jul 31, 2014
by
Sylvain Thery
Browse files
bug apps_cmake + pb on FindSuiteSparse on some distrib
parent
350e8781
Changes
4
Show whitespace changes
Inline
Side-by-side
.gitignore
View file @
2c1e4b36
# ignore QtCreator files
# ignore QtCreator files
CMakeLists.txt.user
CMakeLists.txt.user
bin/
ThirdParty/bin/
SCHNApps/bin
\ No newline at end of file
ThirdParty/OpenNL/CMakeModules/FindSuiteSparse.cmake
View file @
2c1e4b36
...
@@ -60,6 +60,7 @@ else( WIN32 )
...
@@ -60,6 +60,7 @@ else( WIN32 )
PATHS /usr/lib
PATHS /usr/lib
/usr/lib64
/usr/lib64
/usr/lib/x86_64-linux-gnu
/usr/lib/x86_64-linux-gnu
/usr/lib/i386-linux-gnu
/usr/local/lib
)
/usr/local/lib
)
ENDIF
(
APPLE
)
ENDIF
(
APPLE
)
...
...
apps_cmake.txt
View file @
2c1e4b36
...
@@ -130,6 +130,14 @@ ELSE()
...
@@ -130,6 +130,14 @@ ELSE()
ENDIF()
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})
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
IF(WIN32)
IF(WIN32)
...
@@ -140,10 +148,4 @@ ELSE ()
...
@@ -140,10 +148,4 @@ ELSE ()
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
ENDIF ()
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 )
...
@@ -60,6 +60,7 @@ else( WIN32 )
PATHS /usr/lib
PATHS /usr/lib
/usr/lib64
/usr/lib64
/usr/lib/x86_64-linux-gnu
/usr/lib/x86_64-linux-gnu
/usr/lib/i386-linux-gnu
/usr/local/lib
)
/usr/local/lib
)
ENDIF
(
APPLE
)
ENDIF
(
APPLE
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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