Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
8ed9d357
Commit
8ed9d357
authored
Jul 03, 2015
by
Gavin Bises
Browse files
Update project to C++11 compilation.
parent
9159958c
Changes
3
Hide whitespace changes
Inline
Side-by-side
cockatrice/CMakeLists.txt
View file @
8ed9d357
...
@@ -219,6 +219,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
...
@@ -219,6 +219,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
# Build cockatrice binary and link it
# Build cockatrice binary and link it
ADD_EXECUTABLE
(
cockatrice WIN32 MACOSX_BUNDLE
${
cockatrice_SOURCES
}
${
cockatrice_QM
}
${
cockatrice_RESOURCES_RCC
}
${
cockatrice_MOC_SRCS
}
)
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
(
Qt4_FOUND
)
if
(
MSVC
)
if
(
MSVC
)
...
@@ -317,4 +319,4 @@ Data = Resources\")
...
@@ -317,4 +319,4 @@ Data = Resources\")
if
(
WIN32SSLRUNTIME_FOUND
)
if
(
WIN32SSLRUNTIME_FOUND
)
install
(
FILES
${
WIN32SSLRUNTIME_LIBRARIES
}
DESTINATION ./
)
install
(
FILES
${
WIN32SSLRUNTIME_LIBRARIES
}
DESTINATION ./
)
endif
()
endif
()
endif
()
endif
()
\ No newline at end of file
oracle/CMakeLists.txt
View file @
8ed9d357
...
@@ -125,6 +125,8 @@ ENDIF()
...
@@ -125,6 +125,8 @@ ENDIF()
# Build oracle binary and link it
# Build oracle binary and link it
ADD_EXECUTABLE
(
oracle WIN32 MACOSX_BUNDLE
${
oracle_SOURCES
}
${
oracle_QM
}
${
oracle_RESOURCES_RCC
}
${
oracle_MOC_SRCS
}
)
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
(
Qt4_FOUND
)
if
(
MSVC
)
if
(
MSVC
)
...
@@ -228,4 +230,4 @@ Translations = Resources/translations\")
...
@@ -228,4 +230,4 @@ Translations = Resources/translations\")
include(BundleUtilities)
include(BundleUtilities)
fixup_bundle(
\"\$
{CMAKE_INSTALL_PREFIX}/oracle.exe
\"
\"\$
{QTPLUGINS}
\"
\"
${
libSearchDirs
}
\"
)
fixup_bundle(
\"\$
{CMAKE_INSTALL_PREFIX}/oracle.exe
\"
\"\$
{QTPLUGINS}
\"
\"
${
libSearchDirs
}
\"
)
"
COMPONENT Runtime
)
"
COMPONENT Runtime
)
endif
()
endif
()
\ No newline at end of file
servatrice/CMakeLists.txt
View file @
8ed9d357
...
@@ -101,6 +101,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
...
@@ -101,6 +101,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
# Build servatrice binary and link it
# Build servatrice binary and link it
ADD_EXECUTABLE
(
servatrice MACOSX_BUNDLE
${
servatrice_SOURCES
}
${
servatrice_RESOURCES_RCC
}
${
servatrice_MOC_SRCS
}
)
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
(
Qt4_FOUND
)
if
(
MSVC
)
if
(
MSVC
)
...
@@ -197,4 +199,4 @@ Translations = Resources/translations\")
...
@@ -197,4 +199,4 @@ Translations = Resources/translations\")
include(BundleUtilities)
include(BundleUtilities)
fixup_bundle(
\"\$
{CMAKE_INSTALL_PREFIX}/servatrice.exe
\"
\"\$
{QTPLUGINS}
\"
\"
${
QT_LIBRARY_DIR
}
\"
)
fixup_bundle(
\"\$
{CMAKE_INSTALL_PREFIX}/servatrice.exe
\"
\"\$
{QTPLUGINS}
\"
\"
${
QT_LIBRARY_DIR
}
\"
)
"
COMPONENT Runtime
)
"
COMPONENT Runtime
)
endif
()
endif
()
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment