From a6caef1e9b8a59c4385286ce4c37800f77239bc5 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Thu, 19 Apr 2018 01:43:58 -0500
Subject: [PATCH] Remove remnants of QtScript and fix some CMake issues

---
 src/CMakeLists.txt | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f32aa53..3611d0c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,12 +30,22 @@ INCLUDE_DIRECTORIES(${Qt5Core_DIR}/../../../include/QtCore)
 ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
 ADD_LIBRARY(${PROJ_NAME} STATIC ${${PROJ_NAME}_HDRS} ${${PROJ_NAME}_SRCS})
 TARGET_LINK_LIBRARIES(${PROJ_NAME} Qt5::Core Qt5::Network)
-IF(MSVC)
-    SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS /GL)
-    SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LARGEADDRESSAWARE ${OPTIMIZE_LINK_FLAGS}")
-ELSE(MSVC)
-    SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS -std=c++11)
-ENDIF(MSVC)
+
+IF (MSVC)
+  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS "/std:c++latest")
+ENDIF()
+IF (MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+  # 32 bits
+  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS "/LARGEADDRESSAWARE")
+ENDIF()
+
+IF (NOT "${OPTIMIZE_COMPILE_FLAGS}" STREQUAL "")
+  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES COMPILE_FLAGS_RELWITHDEBINFO ${OPTIMIZE_COMPILE_FLAGS})
+ENDIF()
+IF (NOT "${OPTIMIZE_LINK_FLAGS}" STREQUAL "")
+  SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO ${OPTIMIZE_LINK_FLAGS})
+ENDIF()
+
 ###############
 ## Installation