Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
CMake
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
André Pedro
CMake
Commits
00cfa0eb
Commit
00cfa0eb
authored
17 years ago
by
Clinton Stimpson
Browse files
Options
Downloads
Patches
Plain Diff
ENH: For Mac OSX -- add app icon, and implement find of cmake executable.
parent
768680f4
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Source/QtDialog/CMakeLists.txt
+8
-3
8 additions, 3 deletions
Source/QtDialog/CMakeLists.txt
Source/QtDialog/CMakeSetup.icns
+0
-0
0 additions, 0 deletions
Source/QtDialog/CMakeSetup.icns
Source/QtDialog/QCMake.cxx
+2
-1
2 additions, 1 deletion
Source/QtDialog/QCMake.cxx
with
10 additions
and
4 deletions
Source/QtDialog/CMakeLists.txt
+
8
−
3
View file @
00cfa0eb
...
...
@@ -28,10 +28,15 @@ ELSE(NOT QT4_FOUND)
QT4_ADD_RESOURCES
(
RC_SRCS CMakeSetup.qrc
)
SET
(
SRCS
${
SRCS
}
${
UI_SRCS
}
${
MOC_SRCS
}
${
RC_SRCS
}
)
IF
(
WIN
32
)
IF
(
Q_WS_
WIN
)
SET
(
SRCS
${
SRCS
}
CMakeSetup.rc
)
ENDIF
(
WIN32
)
# TODO Mac OS X icon
ENDIF
(
Q_WS_WIN
)
IF
(
Q_WS_MAC
)
SET
(
SRCS
${
SRCS
}
CMakeSetup.icns
)
SET
(
MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns
)
SET_SOURCE_FILES_PROPERTIES
(
CMakeSetup.icns PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
ENDIF
(
Q_WS_MAC
)
INCLUDE_DIRECTORIES
(
${
CMAKE_CURRENT_BINARY_DIR
}
)
INCLUDE_DIRECTORIES
(
${
CMAKE_CURRENT_SOURCE_DIR
}
)
...
...
This diff is collapsed.
Click to expand it.
Source/QtDialog/CMakeSetup.icns
0 → 100644
+
0
−
0
View file @
00cfa0eb
File added
This diff is collapsed.
Click to expand it.
Source/QtDialog/QCMake.cxx
+
2
−
1
View file @
00cfa0eb
...
...
@@ -35,7 +35,8 @@ QCMake::QCMake(QObject* p)
#if defined(Q_OS_WIN)
this
->
CMakeExecutable
=
appDir
.
filePath
(
"cmake.exe"
);
#elif defined(Q_OS_MAC)
# error "need to implement for Mac OS X"
appDir
.
cd
(
"../../../"
);
// path to cmake in build directory (need to fix for deployment)
this
->
CMakeExecutable
=
appDir
.
filePath
(
"cmake"
);
#else
this
->
CMakeExecutable
=
appDir
.
filePath
(
"cmake"
);
#endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment