diff options
author | José Fonseca <jose.r.fonseca@gmail.com> | 2011-12-07 12:54:23 +0000 |
---|---|---|
committer | José Fonseca <jose.r.fonseca@gmail.com> | 2011-12-07 12:54:23 +0000 |
commit | dc92162939bda50fae79e139f599a4c3e8b95047 (patch) | |
tree | a1e06cfd0201bf8bdbdc0449528e3e08a391046f | |
parent | 3bb5dd41c854fdbe0dff49d7e6f732bb71fc2d4b (diff) |
cmake: Be more concise with the glproc.hpp dependency.
Hopefully will fix some of random MSVC build failures.
-rwxr-xr-x | CMakeLists.txt | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f0ef513..270c2ef 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -238,6 +238,7 @@ add_definitions( # Common libraries / utilities include_directories ( + ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/common ) @@ -375,10 +376,10 @@ if (WIN32) DEPENDS wgltrace.py gltrace.py trace.py specs/wglapi.py specs/wglenum.py specs/glapi.py specs/glparams.py specs/gltypes.py specs/winapi.py specs/stdapi.py ) add_library (wgltrace MODULE specs/opengl32.def + ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp wgltrace.cpp glcaps.cpp glproc_gl.cpp - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) set_target_properties (wgltrace PROPERTIES PREFIX "" @@ -397,10 +398,10 @@ elseif (APPLE) ) add_library (cgltrace SHARED + ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp cgltrace.cpp glcaps.cpp glproc_gl.cpp - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) set_target_properties (cgltrace PROPERTIES @@ -497,12 +498,8 @@ add_custom_command ( DEPENDS glstate.py specs/glparams.py specs/gltypes.py specs/stdapi.py ) -include_directories ( - ${CMAKE_CURRENT_BINARY_DIR} - ${OPENGL_INCLUDE_PATH} -) - set (retrace_sources + ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp glretrace_gl.cpp glretrace_cgl.cpp glretrace_glx.cpp @@ -514,7 +511,6 @@ set (retrace_sources retrace.cpp retrace_stdc.cpp glws.cpp - ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp ) add_executable (glretrace |