Skip to content

Commit

Permalink
Merge pull request #128 from eile/master
Browse files Browse the repository at this point in the history
Unify ENV(TRAVIS) and TRAVIS into TRAVIS
  • Loading branch information
tribal-tec committed Apr 9, 2014
2 parents 749f175 + 4d41350 commit b03ad6b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ else()
add_definitions(-D${UPPER_PROJECT_NAME}_LITTLEENDIAN)
endif()


if(CMAKE_SYSTEM_NAME MATCHES "Linux")
set(LINUX TRUE)
if(REDHAT AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$")
Expand Down Expand Up @@ -134,6 +133,10 @@ if(APPLE)
"Building ${CMAKE_PROJECT_NAME} ${VERSION} for ${CMAKE_OSX_ARCHITECTURES}")
endif(APPLE)

if($ENV{TRAVIS})
set(TRAVIS ON)
endif()

include(CommonApplication)
include(CommonCode)
include(CommonLibrary)
Expand Down
2 changes: 1 addition & 1 deletion Doxygit.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ execute_process(COMMAND "${GIT_EXECUTABLE}" add images ${Entries}

# hack to detect that not invoked as script and not under CI
if(VERSION_MAJOR)
if(NOT "$ENV{TRAVIS}")
if(NOT TRAVIS)
foreach(FOLDER ${GIT_DOCUMENTATION_INSTALL})
install(DIRECTORY ${FOLDER} DESTINATION share/${CMAKE_PROJECT_NAME}
CONFIGURATIONS Release)
Expand Down

0 comments on commit b03ad6b

Please sign in to comment.