Merge pull request #233 from mikaelarguedas/modify_prefix_path_only_i…

…f_thirdparty add thirdparty directory to CMAKE_PREFIX_PATH only if THIRDPARTY optio…
eProsima · Jun 25, 2018 · ea57f15 · ea57f15
2 parents 76c4b70 + 96657e3
commit ea57f15
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmake/common/eprosima_libraries.cmake b/cmake/common/eprosima_libraries.cmake
@@ -85,10 +85,10 @@ macro(eprosima_find_thirdparty package thirdparty_name)
             else()
                 message(FATAL_ERROR "Cannot configure Git submodule ${package}")
             endif()
+            set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${PROJECT_SOURCE_DIR}/thirdparty/${thirdparty_name})
+            set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${PROJECT_SOURCE_DIR}/thirdparty/${thirdparty_name}/${thirdparty_name})
         endif()
 
-        set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${PROJECT_SOURCE_DIR}/thirdparty/${thirdparty_name})
-        set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${PROJECT_SOURCE_DIR}/thirdparty/${thirdparty_name}/${thirdparty_name})
         find_package(${package} REQUIRED QUIET)
 
     endif()