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
422f73d4
Commit
422f73d4
authored
Feb 08, 2013
by
Chris Hansen
Browse files
Fixed cmake error on mac install
parent
9f13254d
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/CMakeLists.txt
View file @
422f73d4
...
@@ -222,7 +222,11 @@ INCLUDE_DIRECTORIES(${QT_MOBILITY_MULTIMEDIAKIT_INCLUDE_DIR})
...
@@ -222,7 +222,11 @@ 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_LIBRARIES
}
${
QT_MOBILITY_MULTIMEDIAKIT_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
)
INSTALL
(
PROGRAMS
${
CMAKE_CURRENT_BINARY_DIR
}
/cockatrice DESTINATION bin
)
IF
(
NOT APPLE
)
INSTALL
(
PROGRAMS
${
CMAKE_CURRENT_BINARY_DIR
}
/cockatrice DESTINATION bin
)
ELSE
(
APPLE
)
INSTALL
(
PROGRAMS
${
CMAKE_CURRENT_BINARY_DIR
}
/cockatrice.app DESTINATION bin
)
ENDIF
(
NOT APPLE
)
if
(
NOT WIN32 AND NOT APPLE
)
if
(
NOT WIN32 AND NOT APPLE
)
INSTALL
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/resources/cockatrice.png DESTINATION
${
ICONDIR
}
/hicolor/48x48/apps
)
INSTALL
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/resources/cockatrice.png DESTINATION
${
ICONDIR
}
/hicolor/48x48/apps
)
INSTALL
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/resources/cockatrice.svg DESTINATION
${
ICONDIR
}
/hicolor/scalable/apps
)
INSTALL
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/resources/cockatrice.svg DESTINATION
${
ICONDIR
}
/hicolor/scalable/apps
)
...
...
oracle/CMakeLists.txt
View file @
422f73d4
...
@@ -22,7 +22,11 @@ INCLUDE_DIRECTORIES(../cockatrice/src)
...
@@ -22,7 +22,11 @@ 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_LIBRARIES
}
)
INSTALL
(
PROGRAMS
${
CMAKE_CURRENT_BINARY_DIR
}
/oracle DESTINATION bin
)
IF
(
NOT APPLE
)
INSTALL
(
PROGRAMS
${
CMAKE_CURRENT_BINARY_DIR
}
/oracle DESTINATION bin
)
ELSE
(
APPLE
)
INSTALL
(
PROGRAMS
${
CMAKE_CURRENT_BINARY_DIR
}
/oracle.app DESTINATION bin
)
ENDIF
(
NOT APPLE
)
IF
(
NOT WIN32 AND NOT APPLE
)
IF
(
NOT WIN32 AND NOT APPLE
)
INSTALL
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/oracle.desktop DESTINATION
${
DESKTOPDIR
}
)
INSTALL
(
FILES
${
CMAKE_CURRENT_SOURCE_DIR
}
/oracle.desktop DESTINATION
${
DESKTOPDIR
}
)
ENDIF
(
NOT WIN32 AND NOT APPLE
)
ENDIF
(
NOT WIN32 AND NOT APPLE
)
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