Merge pull request #1197 from Cockatrice/cpp11
This commit is contained in:
commit
7ebf817b17
3 changed files with 9 additions and 3 deletions
|
@ -222,6 +222,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
|
|||
|
||||
# Build cockatrice binary and link it
|
||||
ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_MOC_SRCS})
|
||||
set_property(TARGET cockatrice PROPERTY CXX_STANDARD 11)
|
||||
set_property(TARGET cockatrice PROPERTY CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
if(Qt4_FOUND)
|
||||
if(MSVC)
|
||||
|
@ -320,4 +322,4 @@ Data = Resources\")
|
|||
if(WIN32SSLRUNTIME_FOUND)
|
||||
install(FILES ${WIN32SSLRUNTIME_LIBRARIES} DESTINATION ./)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
@ -125,6 +125,8 @@ ENDIF()
|
|||
|
||||
# Build oracle binary and link it
|
||||
ADD_EXECUTABLE(oracle WIN32 MACOSX_BUNDLE ${oracle_SOURCES} ${oracle_QM} ${oracle_RESOURCES_RCC} ${oracle_MOC_SRCS})
|
||||
set_property(TARGET oracle PROPERTY CXX_STANDARD 11)
|
||||
set_property(TARGET oracle PROPERTY CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
if(Qt4_FOUND)
|
||||
if(MSVC)
|
||||
|
@ -228,4 +230,4 @@ Translations = Resources/translations\")
|
|||
include(BundleUtilities)
|
||||
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/oracle.exe\" \"\${QTPLUGINS}\" \"${libSearchDirs}\")
|
||||
" COMPONENT Runtime)
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
@ -102,6 +102,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
|
|||
|
||||
# Build servatrice binary and link it
|
||||
ADD_EXECUTABLE(servatrice MACOSX_BUNDLE ${servatrice_SOURCES} ${servatrice_RESOURCES_RCC} ${servatrice_MOC_SRCS})
|
||||
set_property(TARGET servatrice PROPERTY CXX_STANDARD 11)
|
||||
set_property(TARGET servatrice PROPERTY CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
if(Qt4_FOUND)
|
||||
if(MSVC)
|
||||
|
@ -198,4 +200,4 @@ Translations = Resources/translations\")
|
|||
include(BundleUtilities)
|
||||
fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/servatrice.exe\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
|
||||
" COMPONENT Runtime)
|
||||
endif()
|
||||
endif()
|
||||
|
|
Loading…
Reference in a new issue