From 97fd691183a1ca776e13115703d4b4109fd0096e Mon Sep 17 00:00:00 2001
From: Zbigniew Mandziejewicz <shaxbee@gmail.com>
Date: Mon, 5 Oct 2015 05:38:37 +0800
Subject: [PATCH] Modernize src and examples CMake build files

---
 examples/CMakeLists.txt | 13 +------------
 src/CMakeLists.txt      | 20 +++++++++-----------
 tests/CMakeLists.txt    | 12 +-----------
 3 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 16a25b0fd..f66897283 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,15 +1,5 @@
-
 link_libraries(glfw)
-
-if (BUILD_SHARED_LIBS)
-    add_definitions(-DGLFW_DLL)
-    link_libraries("${OPENGL_gl_LIBRARY}" "${MATH_LIBRARY}")
-else()
-    link_libraries(${glfw_LIBRARIES})
-endif()
-
-include_directories("${GLFW_SOURCE_DIR}/include"
-                    "${GLFW_SOURCE_DIR}/deps")
+include_directories(${GLFW_SOURCE_DIR}/deps)
 
 if ("${OPENGL_INCLUDE_DIR}")
     include_directories("${OPENGL_INCLUDE_DIR}")
@@ -56,4 +46,3 @@ if (APPLE)
                           MACOSX_BUNDLE_LONG_VERSION_STRING ${GLFW_VERSION_FULL}
                           MACOSX_BUNDLE_INFO_PLIST "${GLFW_SOURCE_DIR}/CMake/MacOSXBundleInfo.plist.in")
 endif()
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 37a762c78..cfc3439b8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,10 +1,3 @@
-
-include_directories("${GLFW_SOURCE_DIR}/src"
-                    "${GLFW_BINARY_DIR}/src"
-                    ${glfw_INCLUDE_DIRS})
-
-add_definitions(-D_GLFW_USE_CONFIG_H)
-
 set(common_HEADERS internal.h
                    "${GLFW_BINARY_DIR}/src/glfw_config.h"
                    "${GLFW_SOURCE_DIR}/include/GLFW/glfw3.h"
@@ -59,9 +52,15 @@ endif()
 
 add_library(glfw ${glfw_SOURCES} ${glfw_HEADERS})
 target_link_libraries(glfw ${glfw_LIBRARIES})
-target_include_directories(glfw PUBLIC 
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>)
+target_include_directories(glfw 
+    PUBLIC 
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
+    PRIVATE 
+        "${GLFW_SOURCE_DIR}/src"
+        "${GLFW_BINARY_DIR}/src"
+        ${glfw_INCLUDE_DIRS})
+target_compile_definitions(glfw PRIVATE -D_GLFW_USE_CONFIG_H)
 
 set_target_properties(glfw PROPERTIES
                       OUTPUT_NAME "${GLFW_LIB_NAME}"
@@ -97,4 +96,3 @@ endif()
 if (GLFW_INSTALL)
     install(TARGETS glfw EXPORT glfwTargets DESTINATION lib${LIB_SUFFIX})
 endif()
-
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index bfc67d83d..ffd87943d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,15 +1,5 @@
-
 link_libraries(glfw)
-
-if (BUILD_SHARED_LIBS)
-    add_definitions(-DGLFW_DLL)
-    link_libraries("${OPENGL_gl_LIBRARY}" "${MATH_LIBRARY}")
-else()
-    link_libraries(${glfw_LIBRARIES})
-endif()
-
-include_directories("${GLFW_SOURCE_DIR}/include"
-                    "${GLFW_SOURCE_DIR}/deps")
+include_directories(${GLFW_SOURCE_DIR}/deps)
 
 if ("${OPENGL_INCLUDE_DIR}")
     include_directories("${OPENGL_INCLUDE_DIR}")