CMake fixes for Windows.
This commit is contained in:
@ -13,17 +13,6 @@ FIND_PACKAGE(Doxygen)
|
||||
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtOpenGL QtTest)
|
||||
INCLUDE(${QT_USE_FILE})
|
||||
|
||||
IF(WIN32)
|
||||
#These are used on Windows to ensure that the .exe's and .dll get placed in the ame directory, so that we can run them.
|
||||
#Note they are actually deprecated in favour of 'RUNTIME_OUTPUT_DIRECTORY' et al, but these replacements apparently don't
|
||||
#work on Windows. See http://www.vtk.org/Bug/bug_view_advanced_page.php?bug_id=8366
|
||||
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
|
||||
SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
|
||||
#These are what _should_ be set. If we require 2.8 then test it with these.
|
||||
#SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
||||
#SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
||||
ENDIF(WIN32)
|
||||
|
||||
if(MSVC AND (MSVC_VERSION LESS 1600))
|
||||
# Require boost for older (pre-vc2010) Visual Studio compilers
|
||||
# See library/include/polyvoximpl/TypeDef.h
|
||||
|
Reference in New Issue
Block a user