Ensure we use the correct generator for building CppUnit

Ultimaker · Aug 9, 2017 · 47260a3 · 47260a3
1 parent 44c2cd9
commit 47260a3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/devel/cppunit.cmake b/devel/cppunit.cmake
@@ -1,4 +1,4 @@
-set(extra_cmake_args "")
+set(extra_cmake_args -G ${CMAKE_GENERATOR})
 set(make_tool "make")
 if(BUILD_OS_WINDOWS)
     set(extra_cmake_args -G "MinGW Makefiles")
@@ -8,7 +8,7 @@ endif()
 ExternalProject_Add(CppUnit
     GIT_REPOSITORY https://github.com/Ultimaker/CppUnit.git
     GIT_TAG cmake
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${extra_cmake_args}
+    CONFIGURE_COMMAND ${CMAKE_COMMAND} ../CppUnit -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${extra_cmake_args}
     BUILD_COMMAND ${make_tool}
     INSTALL_COMMAND ${make_tool} install
 )