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

Implmenting Toolkit API versioning

Browse Source
This commit is contained in:
Michael Tryby
2018-11-29 11:57:51 -05:00
parent 9ff0056b7c
commit be2ca0a9f6
9 changed files with 2191 additions and 2055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
run/CMakeLists.txt
View File

@@ -2,12 +2,12 @@
cmake_minimum_required (VERSION 3.0.2)
# Sets for output directory for executables and libraries.
# Sets for output directory for executables and libraries.
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
# Sets the position independent code property for all targets.
# Sets the position independent code property for all targets.
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -22,7 +22,7 @@ add_definitions(-DWITH_GENX)
# Creates the EPANET command line executable
add_executable(runepanet ${EPANET_CLI_SOURCES})
if(NOT WIN32)
target_link_libraries(runepanet LINK_PUBLIC epanet m)
target_link_libraries(runepanet LINK_PUBLIC epanet2 m)
else(NOT WIN32)
target_link_libraries(runepanet LINK_PUBLIC epanet)
target_link_libraries(runepanet LINK_PUBLIC epanet2)
endif(NOT WIN32)