Merge pull request #20 from michaeltryby/release

Release

Author: michaeltryby

CMakeLists.txt

@@ -25,7 +25,7 @@
 #   CMake is available at https://cmake.org/download/
 #
 
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required (VERSION 3.13)
 
 if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
     message(FATAL_ERROR "In-source builds are disabled.")
@@ -44,6 +44,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 
+# Searches for and create install rules for vcruntime.dll, msvcp.dll, etc.
+include(InstallRequiredSystemLibraries)
 
 # Sets default install prefix when cmakecache is initialized for first time
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

src/CMakeLists.txt

@@ -21,12 +21,6 @@ IF (APPLE)
   set(CMAKE_MACOSX_RPATH 1)
 ENDIF (APPLE)
 
-IF (MSVC)
-  set(CMAKE_C_FLAGS_RELEASE "/GL")
-  add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-ENDIF (MSVC)
-
-
 
 set(HEADER_PATH
     "${PROJECT_SOURCE_DIR}/include"
@@ -142,6 +136,25 @@ else()
   endif()
 endif()
 
+target_compile_options(epanet2
+    PUBLIC
+        "$<$<CXX_COMPILER_ID:MSVC>:"
+            "$<$<CONFIG:Release>:/GL>"
+        ">"
+    )
+
+target_compile_definitions(epanet2
+    PUBLIC
+        "_CRT_SECURE_NO_DEPRECATE"
+    )
+
+target_link_options(epanet2
+    PUBLIC
+        "$<$<CXX_COMPILER_ID:MSVC>:"
+            "$<$<CONFIG:Release>:/LTCG>"
+        ">"
+    )
+
 target_include_directories(epanet2
     PUBLIC
         $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
@@ -157,7 +170,7 @@ install(TARGETS epanet2
     FRAMEWORK  DESTINATION "${TOOL_DIST}"
     )
 
-# Need to list files out individually otherwise is won't work
+# Need to list files out individually otherwise it won't work
 install(
     FILES
         "${PROJECT_SOURCE_DIR}/include/epanet2.def"