From 5b244daa085091b7ff9ec5b5a1f9e5db19462515 Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Tue, 26 Feb 2019 10:36:26 -0500 Subject: [PATCH 1/4] Separating 32 and 64 bit builds --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 82c8161..bfa80cb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,12 +112,13 @@ target_include_directories(epanet2 PUBLIC ${PROJECT_SOURCE_DIR}/include) ELSE (BUILD_PY_LIB) # the shared library - if(NOT WIN32) + IF("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)" OR NOT MSVC) add_library(epanet2 SHARED ${EPANET_LIB_ALL}) - else(NOT WIN32) + ELSE(TRUE) add_library(epanet2 SHARED ${EPANET_LIB_ALL} ${PROJECT_SOURCE_DIR}/include/epanet2.def) set_source_files_properties(${PROJECT_SOURCE_DIR}/include/epanet2.def PROPERTIES_HEADER_FILE_ONLY TRUE) - endif(NOT WIN32) + ENDIF("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)" OR NOT MSVC) + target_include_directories(epanet2 PUBLIC ${PROJECT_SOURCE_DIR}/include) ENDIF (BUILD_PY_LIB) From b403814eaf3ae3c1336ba9d5693b29f93eeaf7e3 Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Tue, 26 Feb 2019 13:42:42 -0500 Subject: [PATCH 2/4] Tweaking in line comments --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bfa80cb..92f834e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # CMakeLists.txt - CMake configuration file for EPANET 2.0 # # CMake is a cross-platform build tool. CMake generates platform native -# makefiles that can be used with your compiler of choice. CMake uses a +# build systems that can be used with your compiler of choice. CMake uses a # generator concept to represent different build tooling. CMake automatically # detects the platform it is running on and generates the appropriate makefiles # for the platform default compiler. Different generators can also be specified. From 08a84074bc898088a9dd308d3d2ba802a91ba9ab Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Tue, 26 Feb 2019 14:29:57 -0500 Subject: [PATCH 3/4] Getting 64 bit reg tests to run --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 655ab56..23dd82e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ environment: GROUP: "EXPERIMENTAL" BOOST_ROOT: "C:/Libraries/boost_1_67_0" PLATFORM: "win64" - REF_BUILD_ID: + REF_BUILD_ID: "220dev5" # called before repo cloning init: From d031d68c9a6fc5010d238ce145c68e9c77d32b33 Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Tue, 26 Feb 2019 14:48:39 -0500 Subject: [PATCH 4/4] Updating REF_BUILD_ID for 64-bit --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 23dd82e..7db9355 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ environment: GROUP: "EXPERIMENTAL" BOOST_ROOT: "C:/Libraries/boost_1_67_0" PLATFORM: "win64" - REF_BUILD_ID: "220dev5" + REF_BUILD_ID: "381_2" # called before repo cloning init: