Remove include_directories from CMakeLists, to enforce relative includes

* This also moves bison generated files into the source tree, so that
  include of glslang_tab.cpp.h and includes from glslang_tab.cpp work
  the same way.

diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
index afabe75..60fb93b 100644 (file)
--- a/OGLCompilersDLL/CMakeLists.txt
+++ b/OGLCompilersDLL/CMakeLists.txt
@@ -1,14 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
 
-include_directories(. ../glslang)
-if(WIN32)
-    include_directories(${include_directories} ../glslang/OSDependent/Windows)
-elseif(UNIX)
-    include_directories(${include_directories} ../glslang/OSDependent/Linux)
-else(WIN32)
-    message("unknown platform")
-endif(WIN32)
-
 set(SOURCES InitializeDll.cpp InitializeDll.h)
 
 add_library(OGLCompiler STATIC ${SOURCES})

diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
index a255aca..945350e 100755 (executable)
--- a/SPIRV/CMakeLists.txt
+++ b/SPIRV/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
 
-include_directories(.. ${CMAKE_CURRENT_BINARY_DIR})
-
 set(SOURCES
     GlslangToSpv.cpp
     SpvBuilder.cpp

diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
index bc35c08..38cb2bd 100644 (file)
--- a/StandAlone/CMakeLists.txt
+++ b/StandAlone/CMakeLists.txt
@@ -1,14 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
 
-include_directories(.)
-if(WIN32)
-    include_directories(../glslang/OSDependent/Windows)
-elseif(UNIX)
-    include_directories(../glslang/OSDependent/Linux)
-else(WIN32)
-    message("unkown platform")
-endif(WIN32)
-
 set(SOURCES StandAlone.cpp)
 set(REMAPPER_SOURCES spirv-remap.cpp)
 

diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index f8b1799..98d2a6c 100644 (file)
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -1,12 +1,9 @@
 cmake_minimum_required(VERSION 2.8)
 
-include_directories(MachineIndependent ../OGLCompilersDLL ${CMAKE_CURRENT_BINARY_DIR})
 if(WIN32)
     add_subdirectory(OSDependent/Windows)
-    include_directories(${include_directories} OSDependent/Windows)
 elseif(UNIX)
     add_subdirectory(OSDependent/Linux)
-    include_directories(${include_directories} OSDependent/Linux)
 else(WIN32)
     message("unkown platform")
 endif(WIN32)
@@ -75,18 +72,18 @@ endif()
 
 # Always use a custom command since our use of --defines isn't assumed by CMake's BISON_TARGET,
 # which ends up causing the target to always be rebuilt.
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp.h
-                   COMMAND ${BISON_EXECUTABLE} --defines=${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp.h -t MachineIndependent/glslang.y -o ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp
+add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp.h
+                   COMMAND ${BISON_EXECUTABLE} --defines=${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp.h -t ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang.y -o ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp
                    MAIN_DEPENDENCY MachineIndependent/glslang.y
                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp)
+set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp)
 
 add_library(glslang STATIC ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
 
 if(WIN32)
     source_group("Public" REGULAR_EXPRESSION "Public/*")
     source_group("MachineIndependent" REGULAR_EXPRESSION "MachineIndependent/[^/]*")
-    source_group("Generated Files" FILES ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp.h)
+    source_group("Generated Files" FILES MachineIndependent/glslang_tab.cpp MachineIndependent/glslang_tab.cpp.h)
     source_group("Include" REGULAR_EXPRESSION "Include/[^/]*")
     source_group("GenericCodeGen" REGULAR_EXPRESSION "GenericCodeGen/*")
     source_group("MachineIndependent\\Preprocessor" REGULAR_EXPRESSION "MachineIndependent/preprocessor/*")

diff --git a/glslang/OSDependent/Linux/CMakeLists.txt b/glslang/OSDependent/Linux/CMakeLists.txt
index c2c6ad8..1480780 100644 (file)
--- a/glslang/OSDependent/Linux/CMakeLists.txt
+++ b/glslang/OSDependent/Linux/CMakeLists.txt
@@ -2,8 +2,6 @@
 
 cmake_minimum_required(VERSION 2.8)
 
-include_directories(. ../../../OGLCompilersDLL)
-
 add_library(OSDependent STATIC ossource.cpp osinclude.h)
 
 install(TARGETS OSDependent 

diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
index 2fcb2c6..be7f93a 100644 (file)
--- a/glslang/OSDependent/Windows/CMakeLists.txt
+++ b/glslang/OSDependent/Windows/CMakeLists.txt
@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
 
-include_directories(. ../../../OGLCompilersDLL)
-
 set(SOURCES ossource.cpp osinclude.h)
 
 add_library(OSDependent STATIC ${SOURCES})