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
a7c957df
Commit
a7c957df
authored
Mar 11, 2014
by
Mark Morschhäuser
Browse files
Fixed CMake files for MSVC++ linker.
parent
32ad8ed2
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/CMakeLists.txt
View file @
a7c957df
...
@@ -221,7 +221,14 @@ INCLUDE_DIRECTORIES(${QT_MOBILITY_INCLUDE_DIR})
...
@@ -221,7 +221,14 @@ INCLUDE_DIRECTORIES(${QT_MOBILITY_INCLUDE_DIR})
INCLUDE_DIRECTORIES
(
${
QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR
}
)
ADD_EXECUTABLE
(
cockatrice WIN32 MACOSX_BUNDLE
${
cockatrice_SOURCES
}
${
cockatrice_QM
}
${
cockatrice_RESOURCES_RCC
}
${
cockatrice_HEADERS_MOC
}
)
ADD_EXECUTABLE
(
cockatrice WIN32 MACOSX_BUNDLE
${
cockatrice_SOURCES
}
${
cockatrice_QM
}
${
cockatrice_RESOURCES_RCC
}
${
cockatrice_HEADERS_MOC
}
)
TARGET_LINK_LIBRARIES
(
cockatrice cockatrice_common
${
QT_LIBRARIES
}
${
QT_MOBILITY_MULTIMEDIAKIT_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
)
TARGET_LINK_LIBRARIES
(
cockatrice cockatrice_common
${
QT_QTMAIN_LIBRARY
}
${
QT_LIBRARIES
}
${
QT_MOBILITY_MULTIMEDIAKIT_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
)
# This check is needed to link cockatrice with MSVC++
if
(
WIN32
)
if
(
MSVC
)
set_target_properties
(
cockatrice PROPERTIES LINK_FLAGS
"/SUBSYSTEM:WINDOWS"
)
endif
()
endif
()
IF
(
NOT APPLE
)
IF
(
NOT APPLE
)
INSTALL
(
PROGRAMS
${
CMAKE_CURRENT_BINARY_DIR
}
/cockatrice DESTINATION bin
)
INSTALL
(
PROGRAMS
${
CMAKE_CURRENT_BINARY_DIR
}
/cockatrice DESTINATION bin
)
...
...
oracle/CMakeLists.txt
View file @
a7c957df
...
@@ -20,7 +20,14 @@ INCLUDE(${QT_USE_FILE})
...
@@ -20,7 +20,14 @@ INCLUDE(${QT_USE_FILE})
INCLUDE_DIRECTORIES
(
../cockatrice/src
)
INCLUDE_DIRECTORIES
(
../cockatrice/src
)
ADD_EXECUTABLE
(
oracle WIN32 MACOSX_BUNDLE
${
oracle_SOURCES
}
${
oracle_HEADERS_MOC
}
)
ADD_EXECUTABLE
(
oracle WIN32 MACOSX_BUNDLE
${
oracle_SOURCES
}
${
oracle_HEADERS_MOC
}
)
TARGET_LINK_LIBRARIES
(
oracle
${
QT_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
oracle
${
QT_QTMAIN_LIBRARY
}
${
QT_LIBRARIES
}
)
# This check is needed to link oracle with MSVC++
if
(
WIN32
)
if
(
MSVC
)
set_target_properties
(
oracle PROPERTIES LINK_FLAGS
"/SUBSYSTEM:WINDOWS"
)
endif
()
endif
()
IF
(
NOT APPLE
)
IF
(
NOT APPLE
)
INSTALL
(
PROGRAMS
${
CMAKE_CURRENT_BINARY_DIR
}
/oracle DESTINATION bin
)
INSTALL
(
PROGRAMS
${
CMAKE_CURRENT_BINARY_DIR
}
/oracle DESTINATION bin
)
...
...
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