Skip to content

Commit

Permalink
Merge pull request #60 from anadon/master
Browse files Browse the repository at this point in the history
Add files to gitignore and improve building on linux platforms.
  • Loading branch information
tonyelewis committed Feb 28, 2018
2 parents 144b71e + 09ebd00 commit 1cacb6b
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 2 deletions.
17 changes: 16 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
doxygen_documentation
doxygen_documentation
CMakeCache.txt
CMakeFiles
Makefile
cmake_install.cmake
source/CMakeFiles
source/Makefile
source/cath_tools_git_version/
source/cmake_install.cmake
source/libct_biocore.a
source/libct_cath_score_align.a
source/libct_chopping.a
source/libct_common.a
source/libct_display_colour.a
source/libct_options.a
source/libct_uni.a
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ MESSAGE( STATUS "Running under CMake v" ${CMAKE_VERSION} )
# If on Linux, get the release codename
IF( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
find_program ( LSB_RELEASE lsb_release )
execute_process( COMMAND ${LSB_RELEASE} -cs OUTPUT_VARIABLE LSB_RELEASE_CODE OUTPUT_STRIP_TRAILING_WHITESPACE)
IF( NOT LSB_RELEASE )
SET( LSB_RELEASE_CODE "Unspecified" )
ELSE()
execute_process( COMMAND ${LSB_RELEASE} -cs OUTPUT_VARIABLE LSB_RELEASE_CODE OUTPUT_STRIP_TRAILING_WHITESPACE)
ENDIF()
ELSE()
# Else set LSB_RELEASE_CODE to something else so the upcoming STREQUAL makes sense
SET( LSB_RELEASE_CODE ${CMAKE_SYSTEM_NAME} )
Expand Down

0 comments on commit 1cacb6b

Please sign in to comment.