From 222a539399fbda438ac92416f678a1784e5ec222 Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Thu, 7 Mar 2013 17:24:09 -0500 Subject: [PATCH] Add explicit dependency to sharp --- CMakeLists.txt | 2 +- sample/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9df817..e77b11e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,7 @@ ExternalProject_Add(sharp SOURCE_DIR ${SHARP_SOURCE} BUILD_IN_SOURCE 1 CONFIGURE_COMMAND ${SHARP_SOURCE}/configure --prefix=${DEP_BUILD} - BUILD_COMMAND make + BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} INSTALL_COMMAND echo "No install" ) diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index 765e1b3..629cbce 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -54,6 +54,7 @@ if (SHARP_LIBRARY AND SHARP_INCLUDE_PATH AND EIGEN3_FOUND) add_executable(test_healpix_calls test_healpix_calls.cpp) target_link_libraries(test_healpix_calls ${tolink} ${SHARP_LIBRARIES}) set_target_properties(test_healpix_calls PROPERTIES COMPILE_FLAGS ${OpenMP_CXX_FLAGS} LINK_FLAGS ${OpenMP_CXX_FLAGS}) + add_dependencies(test_healpix_calls sharp) endif (SHARP_LIBRARY AND SHARP_INCLUDE_PATH AND EIGEN3_FOUND) add_executable(test_cosmopower test_cosmopower.cpp)