Skip to content

Commit 3d9b0ce

Browse files
committed
Merge pull request #39 from ruslo/find_package
No need to test *_FOUND variable before find_package call
2 parents 7aefdcd + 7239b4d commit 3d9b0ce

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

CMakeLists.txt

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,19 @@ add_subdirectory(src)
5353
# Testing
5454
if (CMAKE_PROJECT_NAME STREQUAL "Uri" OR CPP-NETLIB_BUILD_TESTS)
5555
enable_testing()
56-
if (NOT DEFINED GTEST_FOUND)
57-
find_package(GTest REQUIRED)
58-
endif()
56+
find_package(GTest REQUIRED)
5957
add_subdirectory(test)
6058
endif()
6159

6260
# Documentation
63-
if (NOT DOXYGEN_FOUND)
64-
find_package(Doxygen)
65-
if (DOXYGEN_FOUND)
66-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
67-
add_custom_target(doc
68-
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
69-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
70-
COMMENT "Generating API documentation with Doxygen" VERBATIM)
71-
endif(DOXYGEN_FOUND)
72-
endif(NOT DOXYGEN_FOUND)
61+
find_package(Doxygen)
62+
if (DOXYGEN_FOUND)
63+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
64+
add_custom_target(doc
65+
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
66+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
67+
COMMENT "Generating API documentation with Doxygen" VERBATIM)
68+
endif(DOXYGEN_FOUND)
7369

7470
#propagate sources to parent scope for one-lib-build
7571
set(Uri_SRCS ${Uri_SRCS} PARENT_SCOPE)

0 commit comments

Comments
 (0)