mirror of
https://github.com/reactos/CMake.git
synced 2024-11-27 13:30:39 +00:00
ENH: minor cleanup
This commit is contained in:
parent
69ef2513d1
commit
6aa73a8561
@ -1,21 +1,33 @@
|
|||||||
IF(APPLE)
|
IF(APPLE)
|
||||||
SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY}")
|
SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_C_CREATE_SHARED_LIBRARY}")
|
||||||
SET(CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_MODULE}")
|
SET(CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_C_CREATE_SHARED_MODULE}")
|
||||||
STRING( REGEX REPLACE "CMAKE_C_COMPILER" CMAKE_CXX_COMPILER CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}")
|
STRING( REGEX REPLACE "CMAKE_C_COMPILER"
|
||||||
STRING( REGEX REPLACE "CMAKE_C_COMPILER" CMAKE_CXX_COMPILER CMAKE_CXX_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
|
CMAKE_CXX_COMPILER CMAKE_CXX_CREATE_SHARED_MODULE
|
||||||
|
"${CMAKE_CXX_CREATE_SHARED_MODULE}")
|
||||||
|
STRING( REGEX REPLACE "CMAKE_C_COMPILER"
|
||||||
|
CMAKE_CXX_COMPILER CMAKE_CXX_CREATE_SHARED_LIBRARY
|
||||||
|
"${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
|
||||||
ENDIF(APPLE)
|
ENDIF(APPLE)
|
||||||
|
|
||||||
SET(VTKFTGL_BINARY_DIR "${VTK_BINARY_DIR}/Utilities/ftgl" CACHE INTERNAL "")
|
SET(VTKFTGL_BINARY_DIR "${VTK_BINARY_DIR}/Utilities/ftgl"
|
||||||
SET(VTKFREETYPE_BINARY_DIR "${VTK_BINARY_DIR}/Utilities/freetype" CACHE INTERNAL "")
|
CACHE INTERNAL "")
|
||||||
SET(VTKFTGL_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/ftgl" CACHE INTERNAL "")
|
SET(VTKFREETYPE_BINARY_DIR "${VTK_BINARY_DIR}/Utilities/freetype"
|
||||||
SET(VTKFREETYPE_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/freetype" CACHE INTERNAL "")
|
CACHE INTERNAL "")
|
||||||
|
SET(VTKFTGL_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/ftgl"
|
||||||
|
CACHE INTERNAL "")
|
||||||
|
SET(VTKFREETYPE_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/freetype"
|
||||||
|
CACHE INTERNAL "")
|
||||||
|
|
||||||
SET(VTK_GLEXT_FILE "${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/glext.h" CACHE FILEPATH
|
SET(VTK_GLEXT_FILE "${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/glext.h"
|
||||||
|
CACHE FILEPATH
|
||||||
"Location of the OpenGL extensions header file (glext.h).")
|
"Location of the OpenGL extensions header file (glext.h).")
|
||||||
SET(VTK_GLXEXT_FILE "${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/glxext.h" CACHE FILEPATH
|
SET(VTK_GLXEXT_FILE
|
||||||
|
"${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/glxext.h" CACHE FILEPATH
|
||||||
"Location of the GLX extensions header file (glxext.h).")
|
"Location of the GLX extensions header file (glxext.h).")
|
||||||
SET(VTK_WGLEXT_FILE "${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/wglext.h" CACHE FILEPATH
|
SET(VTK_WGLEXT_FILE "${VTK_SOURCE_DIR}/Utilities/ParseOGLExt/headers/wglext.h"
|
||||||
|
CACHE FILEPATH
|
||||||
"Location of the WGL extensions header file (wglext.h).")
|
"Location of the WGL extensions header file (wglext.h).")
|
||||||
|
|
||||||
# work around an old bug in VTK
|
# work around an old bug in VTK
|
||||||
SET(TIFF_RIGHT_VERSION 1)
|
SET(TIFF_RIGHT_VERSION 1)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user