Преглед на файлове

Merge pull request #294 from kainjow/cmake-patch

Apply patch only for OS X
bel2125 преди 9 години
родител
ревизия
b08e8ee0f7
променени са 1 файла, в които са добавени 10 реда и са изтрити 3 реда
  1. 10 3
      test/CMakeLists.txt

+ 10 - 3
test/CMakeLists.txt

@@ -7,6 +7,15 @@ endif()
 
 # We use the check unit testing framework for our C unit tests
 include(ExternalProject)
+if(NOT WIN32)
+  # Apply the patch to check to fix CMake building on OS X
+  set(CHECK_PATCH_COMMAND patch
+     ${CIVETWEB_THIRD_PARTY_DIR}/src/check-unit-test-framework/CMakeLists.txt		
+     ${CMAKE_SOURCE_DIR}/cmake/check/c82fe8888aacfe784476112edd3878256d2e30bc.patch
+   )
+else()
+  set(CHECK_PATCH_COMMAND "")
+endif()
 ExternalProject_Add(check-unit-test-framework
   DEPENDS c-library
   URL "https://codeload.github.com/libcheck/check/zip/${CIVETWEB_CHECK_VERSION}"
@@ -14,9 +23,7 @@ ExternalProject_Add(check-unit-test-framework
   URL_MD5 ${CIVETWEB_CHECK_MD5_HASH}
   PREFIX "${CIVETWEB_THIRD_PARTY_DIR}"
   BUILD_IN_SOURCE 1
-  PATCH_COMMAND patch
-     ${CIVETWEB_THIRD_PARTY_DIR}/src/check-unit-test-framework/CMakeLists.txt		
-     ${CMAKE_SOURCE_DIR}/cmake/check/c82fe8888aacfe784476112edd3878256d2e30bc.patch
+  PATCH_COMMAND ${CHECK_PATCH_COMMAND}
   CMAKE_ARGS
     "-DCMAKE_BUILD_TYPE=Release"
     "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}"