Merge remote-tracking branch 'github/markdown'

[apitrace] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f388991973368cc101f53fafb78da64bbecd333a..3d6687132de50f10294b712213e838ac987ed2d4 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ endif (WIN32)
 
 if (MSVC)
     # C99 includes for msvc
-    include_directories (msvc)
+    include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/msvc)
 
     # Enable math constants defines
     add_definitions (-D_USE_MATH_DEFINES)
@@ -105,9 +105,7 @@ endif ()
 
 # Put all executables into the same top level build directory, regardless of
 # which subdirectory they are declared
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-
-include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 
 ##############################################################################
@@ -118,26 +116,31 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 # - on unices to prevent symbol collisions when tracing applications that link
 # against other versions of these libraries
 
-set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/zlib)
+set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib)
 set (ZLIB_LIBRARIES z_bundled)
-add_subdirectory (zlib EXCLUDE_FROM_ALL)
+add_subdirectory (thirdparty/zlib EXCLUDE_FROM_ALL)
 
 include_directories (${ZLIB_INCLUDE_DIRS})
 link_libraries (${ZLIB_LIBRARIES})
 
-set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libpng)
+set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng)
 set (PNG_DEFINITIONS "")
 set (PNG_LIBRARIES png_bundled)
 
-add_subdirectory (libpng EXCLUDE_FROM_ALL)
+add_subdirectory (thirdparty/libpng EXCLUDE_FROM_ALL)
 include_directories (${PNG_INCLUDE_DIR})
 add_definitions (${PNG_DEFINITIONS})
 link_libraries (${PNG_LIBRARIES})
 
+# For glext headers
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
+
 
 ##############################################################################
 # Common libraries / utilities
 
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+
 add_custom_command (
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glproc.py > ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
@@ -373,7 +376,7 @@ endif (QT4_FOUND AND QJSON_FOUND)
 ##############################################################################
 # Packaging
 
-install (FILES LICENSE README TODO DESTINATION doc)
+install (FILES LICENSE README.markdown TODO.markdown DESTINATION doc)
 
 set (CPACK_PACKAGE_VERSION_MAJOR "1")
 set (CPACK_PACKAGE_VERSION_MINOR "0")