Commit 95bc803b authored by Guillaume Pasero's avatar Guillaume Pasero

BUG: Mantis-1456: specific configure command for JPEG, GLUT, GLEW

parent f29e512d
......@@ -30,7 +30,7 @@ ExternalProject_Add(GLEW
BINARY_DIR ${GLEW_SB_BUILD_DIR}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
INSTALL_DIR ${SB_INSTALL_PREFIX}
CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_CACHE_ARGS} -DBUILD_UTILS:BOOL=OFF ${GLEW_SB_SRC}/build/cmake/
CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_ARGS} ${SB_CMAKE_CACHE_ARGS} -DBUILD_UTILS:BOOL=OFF ${GLEW_SB_SRC}/build/cmake/
LOG_DOWNLOAD 1
LOG_CONFIGURE 1
LOG_BUILD 1
......
......@@ -41,7 +41,7 @@ else(MSVC)
${GLUT_SB_SRC}
)
set(GLUT_CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_CACHE_ARGS} ${GLUT_SB_SRC} )
set(GLUT_CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_ARGS} ${SB_CMAKE_CACHE_ARGS} ${GLUT_SB_SRC} )
endif()
ExternalProject_Add(GLUT
......
......@@ -24,6 +24,7 @@ SETUP_SUPERBUILD(JPEG)
if(WIN32)
set(JPEG_CONFIGURE_COMMAND "${SB_CMAKE_COMMAND}"
${SB_CMAKE_ARGS}
${SB_CMAKE_CACHE_ARGS}
-DENABLE_SHARED=TRUE
-DENABLE_STATIC=FALSE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment