Commit 2c1e4b36 authored by Sylvain Thery's avatar Sylvain Thery

bug apps_cmake + pb on FindSuiteSparse on some distrib

parent 350e8781
# ignore QtCreator files # ignore QtCreator files
CMakeLists.txt.user CMakeLists.txt.user
\ No newline at end of file bin/
ThirdParty/bin/
SCHNApps/bin
\ No newline at end of file
...@@ -58,8 +58,9 @@ else( WIN32 ) ...@@ -58,8 +58,9 @@ else( WIN32 )
FIND_PATH( SUITESPARSE_LIBRARY_DIR FIND_PATH( SUITESPARSE_LIBRARY_DIR
NAMES libcholmod.so libcholmod.a NAMES libcholmod.so libcholmod.a
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)
......
...@@ -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()
...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment