Merging latest from dev, trying to get import lib generated

This commit is contained in:
Michael Tryby
2018-07-03 17:38:40 -04:00
73 changed files with 3622 additions and 16583 deletions

View File

@@ -1,27 +1,26 @@
# 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
# generator concept to represent different build tooling. CMake automatically
# 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
# 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.
#
# Note: CMake requires that your platform build system and compiler are
# properly installed. Build using Visual Studio requires msbuild shell.
#
# Example Usage:
# cd build/cmake
# for the platform default compiler. Different generators can also be specified.
#
# Note: CMake requires that your platform build system and compiler are
# properly installed. Build using Visual Studio requires msbuild shell.
#
# Example Usage:
# mkdir buildproducts
# cd buildproducts
# cmake ..
# make
#
# make
#
# Building MSYS on Windows:
# ...
# cmake -G "MSYS Makefiles" ..
# make
#
# Building Visual Studio on Windows:
# make
#
# Building Visual Studio on Windows:
# ...
# cmake -G "Visual Studio 10 2010" ..
# msbuild /p:Configuration=Release ALL_BUILD.vcxproj
@@ -29,26 +28,37 @@
# Generic Invocation:
# cmake -E make_directory buildprod
# cd build
# cmake -G GENERATOR -DCMAKE_BUILD_TYPE=Release ..
# cmake -G GENERATOR -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=1 ..
# cmake --build . --target SOME_TARGET --config Release
#
# More information:
# cmake --help
#
#
# CMake is available at https://cmake.org/download/
#
#
cmake_minimum_required (VERSION 2.8.8)
project(EPANET)
add_subdirectory(run)
add_subdirectory(tools/epanet-output)
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
IF (BUILD_TESTS)
add_subdirectory(tests)
ENDIF (BUILD_TESTS)
# 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
SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
IF (APPLE)
SET(CMAKE_INSTALL_NAME_DIR @executable_path)
SET(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
SET(INSTALL_NAME_DIR @executable_path/../lib)
SET(CMAKE_MACOSX_RPATH 1)
ENDIF (APPLE)
IF (MSVC)
@@ -56,31 +66,28 @@ IF (MSVC)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
ENDIF (MSVC)
include_directories(include src tools/epanet-output/src)
# configure file groups
file(GLOB EPANET_SOURCES src/*.c)
set(EPANET_API_HEADER include/epanet2.h)
set(EPANET_CLI_SOURCES run/main.c)
file(GLOB EPANET_OUT_SOURCES tools/epanet-output/src/*.c)
set(EPANET_OUT_HEADER tools/epanet-output/src/epanet_output.h)
file(GLOB EPANET_LIB_ALL src/*.c)
file(GLOB EPANET_LIB_ALL src/*)
source_group("Library" FILES ${EPANET_LIB_ALL})
source_group("CLI" REGULAR_EXPRESSION "run/.*")
source_group("Output" FILES ${EPANET_OUT_SOURCES})
# the shared library
add_library(epanet SHARED ${EPANET_SOURCES} ${EPANET_API_HEADER})
add_library(epanet SHARED ${EPANET_SOURCES}) #${EPANET_API_HEADER})
target_include_directories(epanet PUBLIC ${PROJECT_SOURCE_DIR}/include)
# the standalone executable
add_executable(runepanet ${EPANET_CLI_SOURCES})
if(NOT MSVC)
target_link_libraries(runepanet LINK_PUBLIC epanet m)
else(NOT MSVC)
target_link_libraries(runepanet LINK_PUBLIC epanet)
endif(NOT MSVC)
# create export lib so we can link against dll using Visual Studio
include(GenerateExportHeader)
GENERATE_EXPORT_HEADER(epanet
BASE_NAME epanet
EXPORT_MACRO_NAME DLLEXPORT
EXPORT_FILE_NAME epanet_export.h
STATIC_DEFINE SHARED_EXPORTS_BUILT_AS_STATIC)
# the binary hydraulics file API
add_library(epanet-output SHARED ${EPANET_OUT_SOURCES} ${EPANET_OUT_HEADERS})
file(COPY ${CMAKE_CURRENT_BINARY_DIR}/epanet_export.h
DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/include)