mo2/githubpp
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/githubpp.git synced 2026-07-27 14:04:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from Modorganizer2/Develop

Browse Source 
Stage for 2.1.3 release
This commit is contained in:
Brian Munro
2018-05-08 12:32:54 +02:00
committed by GitHub
parent 78ef7d5c2a e9ccbe242d
commit f49412d0af
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+5
View File
@@ -0,0 +1,5 @@
edit
CMakeLists.txt.user
/msbuild.log
/*std*.log
/*build
src/CMakeLists.txt
+16 -6
View File
@@ -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