Move gl2ps.h to its own subdir

root-project · Jun 21, 2016 · 3724d43 · musinsky · Jun 22, 2016 · musinsky
1 parent 898478d
commit 3724d43
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/graf3d/gl/CMakeLists.txt b/graf3d/gl/CMakeLists.txt
@@ -5,19 +5,18 @@
 include_directories(${OPENGL_INCLUDE_DIR} ${FTGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})
 
 ROOT_GLOB_HEADERS(headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CMAKE_CURRENT_SOURCE_DIR}/inc/*.h)
-list(REMOVE_ITEM headers gl2ps.h CsgOps.h TGLIncludes.h TGLWSIncludes.h
+list(REMOVE_ITEM headers  CsgOps.h TGLIncludes.h TGLWSIncludes.h
                      TGLMarchingCubes.h TKDEAdapter.h TGL5DPainter.h TKDEFGT.h TGLIsoMesh.h)
-set (installoptions OPTIONS REGEX gl2ps.h EXCLUDE)
 ROOT_GLOB_SOURCES(sources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cxx)
 
 if(WIN32 OR cocoa)
   list(REMOVE_ITEM headers TX11GL.h)
   list(REMOVE_ITEM sources TX11GL.cxx)
-  set(installoptions ${installoptions} REGEX TX11GL.h EXCLUDE)
+  set(installoptions OPTIONS REGEX "TX11GL" EXCLUDE)
 endif()
 
 if(builtin_gl2ps)
-  include_directories(AFTER ${CMAKE_CURRENT_SOURCE_DIR}/inc)
+  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/gl2ps)
 else()
   list(REMOVE_ITEM sources gl2ps.cxx)
   include_directories(${GL2PS_INCLUDE_DIRS})

diff --git a/graf3d/gl/Module.mk b/graf3d/gl/Module.mk
@@ -42,6 +42,13 @@ GLH1         := $(MODDIRI)/CsgOps.h \
 # Used by rootcint
 GLH2         := $(filter-out $(GLH1), $(GLH))
 
+ifeq ($(BUILTINGL2PS),yes)
+GL2PSFLAGS   := -I$(MODDIRS)/gl2ps
+else()
+GLS          := $(filter-out $(MODDIRS)/gl2ps.cxx, $(GLS))
+GL2PSFLAGS   := $(GL2PSINCDIR:%=-I%)
+endif()
+
 ifneq ($(OPENGLLIB),)
 GLLIBS       := $(OPENGLLIBDIR) $(OPENGLULIB) $(OPENGLLIB) \
                 $(XLIBS) -lm

diff --git a/graf3d/gl/src/gl2ps.h → graf3d/gl/src/gl2ps/gl2ps.h b/graf3d/gl/src/gl2ps.h → graf3d/gl/src/gl2ps/gl2ps.h