JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
This commit is contained in:
Michael Tryby
2019-02-26 16:13:14 -05:00
parent e720d4b4f3 6713d84171
commit ab536d1927
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -1,7 +1,7 @@
# CMakeLists.txt - CMake configuration file for EPANET 2.0 # CMakeLists.txt - CMake configuration file for EPANET 2.0
# #
# CMake is a cross-platform build tool. CMake generates platform native # 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 # generator concept to represent different build tooling. CMake automatically
# detects the platform it is running on and generates the appropriate makefiles # detects the platform it is running on and generates the appropriate makefiles
# for the platform default compiler. Different generators can also be specified. # for the platform default compiler. Different generators can also be specified.
@@ -112,12 +112,13 @@ target_include_directories(epanet2 PUBLIC ${PROJECT_SOURCE_DIR}/include)
ELSE (BUILD_PY_LIB) ELSE (BUILD_PY_LIB)
# the shared library # the shared library
if(NOT WIN32) IF("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)" OR NOT MSVC)
add_library(epanet2 SHARED ${EPANET_LIB_ALL}) 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) 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) 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) target_include_directories(epanet2 PUBLIC ${PROJECT_SOURCE_DIR}/include)
ENDIF (BUILD_PY_LIB) ENDIF (BUILD_PY_LIB)

2
appveyor.yml
View File

@@ -29,7 +29,7 @@ environment:
GROUP: "EXPERIMENTAL" GROUP: "EXPERIMENTAL"
BOOST_ROOT: "C:/Libraries/boost_1_67_0" BOOST_ROOT: "C:/Libraries/boost_1_67_0"
PLATFORM: "win64" PLATFORM: "win64"
REF_BUILD_ID: REF_BUILD_ID: "381_2"
# called before repo cloning # called before repo cloning
init: init: