Added missing headers to library target.

This commit is contained in:
Camilla Berglund 2013-06-17 10:26:57 +02:00
parent 305c66db31
commit 01ccc56423
2 changed files with 20 additions and 18 deletions

View File

@ -365,23 +365,6 @@ else()
set(GLFW_LIB_NAME glfw3) set(GLFW_LIB_NAME glfw3)
endif() endif()
#--------------------------------------------------------------------
# Add subdirectories
#--------------------------------------------------------------------
add_subdirectory(src)
if (GLFW_BUILD_EXAMPLES)
add_subdirectory(examples)
endif()
if (GLFW_BUILD_TESTS)
add_subdirectory(tests)
endif()
if (DOXYGEN_FOUND)
add_subdirectory(docs)
endif()
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Create generated files # Create generated files
#-------------------------------------------------------------------- #--------------------------------------------------------------------
@ -402,6 +385,23 @@ if (UNIX)
${GLFW_BINARY_DIR}/src/glfw3.pc @ONLY) ${GLFW_BINARY_DIR}/src/glfw3.pc @ONLY)
endif() endif()
#--------------------------------------------------------------------
# Add subdirectories
#--------------------------------------------------------------------
add_subdirectory(src)
if (GLFW_BUILD_EXAMPLES)
add_subdirectory(examples)
endif()
if (GLFW_BUILD_TESTS)
add_subdirectory(tests)
endif()
if (DOXYGEN_FOUND)
add_subdirectory(docs)
endif()
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Install files # Install files
# The library is installed by src/CMakeLists.txt # The library is installed by src/CMakeLists.txt

View File

@ -7,7 +7,9 @@ if (MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif() endif()
set(common_HEADERS ${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h internal.h) set(common_HEADERS ${GLFW_BINARY_DIR}/src/config.h internal.h
${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h
${GLFW_SOURCE_DIR}/include/GLFW/glfw3native.h)
set(common_SOURCES clipboard.c context.c gamma.c init.c input.c joystick.c set(common_SOURCES clipboard.c context.c gamma.c init.c input.c joystick.c
monitor.c time.c window.c) monitor.c time.c window.c)