Skip to content

Commit

Permalink
Merge da7ba49 into a548183
Browse files Browse the repository at this point in the history
  • Loading branch information
tom-seddon committed Jul 8, 2017
2 parents a548183 + da7ba49 commit f169119
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ if(ENABLE_MANUAL)
endif()
endif()
# Required for building manual, docs, tests
find_package(Perl REQUIRED)
find_package(Perl)

# We need ansi c-flags, especially on HP
set(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
Expand Down Expand Up @@ -1179,15 +1179,24 @@ function(TRANSFORM_MAKEFILE_INC INPUT_FILE OUTPUT_FILE)

endfunction()

add_subdirectory(docs)
if(PERL_FOUND)
add_subdirectory(docs)
else()
message(WARNING "Perl not found - not building docs")
endif()

add_subdirectory(lib)
if(BUILD_CURL_EXE)
add_subdirectory(src)
endif()

include(CTest)
if(BUILD_TESTING)
add_subdirectory(tests)
if(PERL_FOUND)
add_subdirectory(tests)
else()
message(WARNING "Perl not found - not building tests")
endif()
endif()

# Helper to populate a list (_items) with a label when conditions (the remaining
Expand Down

0 comments on commit f169119

Please sign in to comment.