Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
glfw
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pirvi-public
glfw
Commits
5a1512aa
Commit
5a1512aa
authored
5 years ago
by
Camilla Löwy
Browse files
Options
Downloads
Patches
Plain Diff
Rename CMake variable for GUI-only programs
Hopefully this is less ambiguous. (cherry picked from commit
92c70b2a
)
parent
b05d8879
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
examples/CMakeLists.txt
+5
-4
5 additions, 4 deletions
examples/CMakeLists.txt
tests/CMakeLists.txt
+5
-5
5 additions, 5 deletions
tests/CMakeLists.txt
with
10 additions
and
9 deletions
examples/CMakeLists.txt
+
5
−
4
View file @
5a1512aa
...
...
@@ -56,15 +56,16 @@ if (RT_LIBRARY)
target_link_libraries
(
particles
"
${
RT_LIBRARY
}
"
)
endif
()
set
(
WINDOWS_BINARIES boing gears heightmap particles sharing simple splitview wave
)
set
(
GUI_ONLY_BINARIES boing gears heightmap particles sharing simple splitview
wave
)
set
(
CONSOLE_BINARIES offscreen
)
set_target_properties
(
${
WINDOWS
_BINARIES
}
${
CONSOLE_BINARIES
}
PROPERTIES
set_target_properties
(
${
GUI_ONLY
_BINARIES
}
${
CONSOLE_BINARIES
}
PROPERTIES
FOLDER
"GLFW3/Examples"
)
if
(
MSVC
)
# Tell MSVC to use main instead of WinMain for Windows subsystem executables
set_target_properties
(
${
WINDOWS
_BINARIES
}
PROPERTIES
set_target_properties
(
${
GUI_ONLY
_BINARIES
}
PROPERTIES
LINK_FLAGS
"/ENTRY:mainCRTStartup"
)
endif
()
...
...
@@ -78,7 +79,7 @@ if (APPLE)
set_target_properties
(
splitview PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME
"SplitView"
)
set_target_properties
(
wave PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME
"Wave"
)
set_target_properties
(
${
WINDOWS
_BINARIES
}
PROPERTIES
set_target_properties
(
${
GUI_ONLY
_BINARIES
}
PROPERTIES
RESOURCE glfw.icns
MACOSX_BUNDLE_SHORT_VERSION_STRING
${
GLFW_VERSION
}
MACOSX_BUNDLE_LONG_VERSION_STRING
${
GLFW_VERSION
}
...
...
This diff is collapsed.
Click to expand it.
tests/CMakeLists.txt
+
5
−
5
View file @
5a1512aa
...
...
@@ -60,17 +60,17 @@ if (RT_LIBRARY)
target_link_libraries
(
threads
"
${
RT_LIBRARY
}
"
)
endif
()
set
(
WINDOWS
_BINARIES empty gamma icon inputlag joysticks opacity tearing
set
(
GUI_ONLY
_BINARIES empty gamma icon inputlag joysticks opacity tearing
threads timeout title triangle-vulkan windows
)
set
(
CONSOLE_BINARIES clipboard events msaa glfwinfo iconify monitors reopen
cursor
)
set_target_properties
(
${
WINDOWS
_BINARIES
}
${
CONSOLE_BINARIES
}
PROPERTIES
set_target_properties
(
${
GUI_ONLY
_BINARIES
}
${
CONSOLE_BINARIES
}
PROPERTIES
FOLDER
"GLFW3/Tests"
)
if
(
MSVC
)
# Tell MSVC to use main instead of WinMain for Windows subsystem executables
set_target_properties
(
${
WINDOWS
_BINARIES
}
${
CONSOLE_BINARIES
}
PROPERTIES
set_target_properties
(
${
GUI_ONLY
_BINARIES
}
${
CONSOLE_BINARIES
}
PROPERTIES
LINK_FLAGS
"/ENTRY:mainCRTStartup"
)
endif
()
...
...
@@ -87,7 +87,7 @@ if (APPLE)
set_target_properties
(
triangle-vulkan PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME
"Vulkan Triangle"
)
set_target_properties
(
windows PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME
"Windows"
)
set_target_properties
(
${
WINDOWS
_BINARIES
}
${
CONSOLE_BINARIES
}
PROPERTIES
set_target_properties
(
${
GUI_ONLY
_BINARIES
}
${
CONSOLE_BINARIES
}
PROPERTIES
MACOSX_BUNDLE_SHORT_VERSION_STRING
${
GLFW_VERSION
}
MACOSX_BUNDLE_LONG_VERSION_STRING
${
GLFW_VERSION
}
MACOSX_BUNDLE_INFO_PLIST
"
${
GLFW_SOURCE_DIR
}
/CMake/MacOSXBundleInfo.plist.in"
)
...
...
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