|
 |
221b06 |
diff -up pmdk-convert-1.5/CMakeLists.txt.orig pmdk-convert-1.5/CMakeLists.txt
|
|
|
221b06 |
--- pmdk-convert-1.5/CMakeLists.txt.orig 2018-10-26 12:23:57.000000000 -0400
|
|
|
221b06 |
+++ pmdk-convert-1.5/CMakeLists.txt 2019-03-22 12:43:08.677276000 -0400
|
|
|
221b06 |
@@ -31,7 +31,7 @@
|
|
|
221b06 |
|
|
|
221b06 |
include(${CMAKE_SOURCE_DIR}/utils/utils.cmake)
|
|
|
221b06 |
|
|
|
221b06 |
-cmake_minimum_required(VERSION 3.3)
|
|
|
221b06 |
+cmake_minimum_required(VERSION 2.8)
|
|
|
221b06 |
project(pmdk-convert C)
|
|
|
221b06 |
|
|
|
221b06 |
set(VERSION_MAJOR 1)
|
|
|
221b06 |
@@ -92,6 +92,7 @@ macro(add_c_flag flag)
|
|
|
221b06 |
endmacro()
|
|
|
221b06 |
|
|
|
221b06 |
if(NOT MSVC)
|
|
|
221b06 |
+ add_c_flag(-std=gnu99)
|
|
|
221b06 |
add_c_flag(-fno-common)
|
|
|
221b06 |
add_c_flag(-Wall)
|
|
|
221b06 |
add_c_flag(-Wconversion)
|
|
|
221b06 |
diff -up pmdk-convert-1.5/tests/CMakeLists.txt.orig pmdk-convert-1.5/tests/CMakeLists.txt
|
|
|
221b06 |
--- pmdk-convert-1.5/tests/CMakeLists.txt.orig 2018-10-26 12:23:57.000000000 -0400
|
|
|
221b06 |
+++ pmdk-convert-1.5/tests/CMakeLists.txt 2019-03-22 12:43:08.684278000 -0400
|
|
|
221b06 |
@@ -65,7 +65,7 @@ function(test name file)
|
|
|
221b06 |
-DSRC_DIR=${CMAKE_CURRENT_SOURCE_DIR}
|
|
|
221b06 |
-DBIN_DIR=${CMAKE_CURRENT_BINARY_DIR}/${file}
|
|
|
221b06 |
-DVERSIONS=${VERSIONS}
|
|
|
221b06 |
- -DCONFIG=$<CONFIG>
|
|
|
221b06 |
+ -DCONFIG=$<CONFIGURATION>
|
|
|
221b06 |
-P ${CMAKE_CURRENT_SOURCE_DIR}/${file}.cmake)
|
|
|
221b06 |
|
|
|
221b06 |
set_tests_properties(${name} PROPERTIES
|
|
|
221b06 |
diff -up pmdk-convert-1.5/tests/helpers.cmake.orig pmdk-convert-1.5/tests/helpers.cmake
|
|
|
221b06 |
--- pmdk-convert-1.5/tests/helpers.cmake.orig 2018-10-26 12:23:57.000000000 -0400
|
|
|
221b06 |
+++ pmdk-convert-1.5/tests/helpers.cmake 2019-03-22 12:47:31.214242000 -0400
|
|
|
221b06 |
@@ -29,7 +29,7 @@
|
|
|
221b06 |
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
|
221b06 |
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
221b06 |
|
|
|
221b06 |
-cmake_minimum_required(VERSION 3.3)
|
|
|
221b06 |
+cmake_minimum_required(VERSION 2.8)
|
|
|
221b06 |
set(DIR ${PARENT_DIR}/😘⠝⠧⠍⠇ɗPMDKӜ⥺🙋${TEST_NAME})
|
|
|
221b06 |
|
|
|
221b06 |
# convert the version list to the array
|
|
|
221b06 |
@@ -49,10 +49,11 @@ function(check_open pool correct)
|
|
|
221b06 |
string(REPLACE " " ";" correct ${correct})
|
|
|
221b06 |
foreach(it ${VERSIONS})
|
|
|
221b06 |
string(REPLACE "." "" app ${it})
|
|
|
221b06 |
- if (${it} IN_LIST correct)
|
|
|
221b06 |
- execute(0 ${TEST_DIR}/open_${app} ${pool})
|
|
|
221b06 |
- else()
|
|
|
221b06 |
+ list(FIND correct ${it} index)
|
|
|
221b06 |
+ if (index LESS 0)
|
|
|
221b06 |
execute(2 ${TEST_DIR}/open_${app} ${pool})
|
|
|
221b06 |
+ else()
|
|
|
221b06 |
+ execute(0 ${TEST_DIR}/open_${app} ${pool})
|
|
|
221b06 |
endif()
|
|
|
221b06 |
endforeach(it)
|
|
|
221b06 |
endfunction(check_open)
|