Zengtudor
/
glfw
mirror of https://github.com/glfw/glfw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup of configuration variable use.

This commit is contained in:
Camilla Berglund 2012-12-02 19:13:01 +01:00
parent 0aaa120f12
commit ccdb776cc3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@ -53,7 +53,7 @@ elseif (_GLFW_X11)
list(APPEND glfw_SOURCES ${common_SOURCES} glx_context.c) list(APPEND glfw_SOURCES ${common_SOURCES} glx_context.c)
endif() endif()
if (_GLFW_NSGL) if (APPLE)
# For some reason, CMake doesn't know about .m # For some reason, CMake doesn't know about .m
set_source_files_properties(${glfw_SOURCES} PROPERTIES LANGUAGE C) set_source_files_properties(${glfw_SOURCES} PROPERTIES LANGUAGE C)
endif() endif()
@ -68,7 +68,7 @@ if (BUILD_SHARED_LIBS)
set_target_properties(glfw PROPERTIES SOVERSION ${GLFW_VERSION_MAJOR}) set_target_properties(glfw PROPERTIES SOVERSION ${GLFW_VERSION_MAJOR})
endif() endif()
if (_GLFW_WIN32) if (WIN32)
# The GLFW DLL needs a special compile-time macro and import library name # The GLFW DLL needs a special compile-time macro and import library name
set_target_properties(glfw PROPERTIES PREFIX "" IMPORT_PREFIX "") set_target_properties(glfw PROPERTIES PREFIX "" IMPORT_PREFIX "")
@ -77,7 +77,7 @@ if (BUILD_SHARED_LIBS)
else() else()
set_target_properties(glfw PROPERTIES IMPORT_SUFFIX "dll.lib") set_target_properties(glfw PROPERTIES IMPORT_SUFFIX "dll.lib")
endif() endif()
elseif (_GLFW_COCOA) elseif (APPLE)
# Append -fno-common to the compile flags to work around a bug in # Append -fno-common to the compile flags to work around a bug in
# Apple's GCC # Apple's GCC
get_target_property(glfw_CFLAGS glfw COMPILE_FLAGS) get_target_property(glfw_CFLAGS glfw COMPILE_FLAGS)