From 01ccc56423da8490ebd95ec45fb3dc54a8d6a3e4 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 17 Jun 2013 10:26:57 +0200 Subject: [PATCH] Added missing headers to library target. --- CMakeLists.txt | 34 +++++++++++++++++----------------- src/CMakeLists.txt | 4 +++- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1eebc062..6626a73f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -365,23 +365,6 @@ else() set(GLFW_LIB_NAME glfw3) 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 #-------------------------------------------------------------------- @@ -402,6 +385,23 @@ if (UNIX) ${GLFW_BINARY_DIR}/src/glfw3.pc @ONLY) 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 # The library is installed by src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f4ac6f2..9e4748a7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,9 @@ if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) 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 monitor.c time.c window.c)