Commit 717a86e5 authored by bonnell's avatar bonnell
Browse files

Allow data dir to be built on Windows.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13451 18c085ea-50e0-402c-830e-de6fd14e8384
parent 04646e0b
...@@ -204,6 +204,9 @@ ...@@ -204,6 +204,9 @@
# Turn on use of FOLDER property. # Turn on use of FOLDER property.
# Move Plugin macros to their own CMake file. # Move Plugin macros to their own CMake file.
# #
# Kathleen Bonnell, Thu Jan 6 15:31:12 PST 2010
# Allow data dir to be built on windows.
#
#****************************************************************************/ #****************************************************************************/
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
...@@ -1655,13 +1658,23 @@ ADD_SUBDIRECTORY(svn_bin) ...@@ -1655,13 +1658,23 @@ ADD_SUBDIRECTORY(svn_bin)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add the "data" directory if it exists # Add the "data" directory if it exists
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
IF(NOT WIN32 AND IS_DIRECTORY ${VISIT_SOURCE_DIR}/../data) IF(IS_DIRECTORY ${VISIT_SOURCE_DIR}/../data)
IF(WIN32)
# Don't want the data dir files to be added to the main VISIT
# solution file, so 'EXCLUDE_FROM_ALL' here, and create a new
# PROJECT in data/CMakeLists.txt
SET(V_EX "EXCLUDE_FROM_ALL")
ENDIF(WIN32)
IF(VISIT_OUT_OF_SOURCE_BUILD) IF(VISIT_OUT_OF_SOURCE_BUILD)
ADD_SUBDIRECTORY(${VISIT_SOURCE_DIR}/../data ${CMAKE_CURRENT_BINARY_DIR}/data ) ADD_SUBDIRECTORY(${VISIT_SOURCE_DIR}/../data
${CMAKE_CURRENT_BINARY_DIR}/data
${V_EX})
ELSE(VISIT_OUT_OF_SOURCE_BUILD) ELSE(VISIT_OUT_OF_SOURCE_BUILD)
ADD_SUBDIRECTORY(${VISIT_SOURCE_DIR}/../data ${VISIT_SOURCE_DIR}/../data) ADD_SUBDIRECTORY(${VISIT_SOURCE_DIR}/../data
${VISIT_SOURCE_DIR}/../data
${V_EX})
ENDIF(VISIT_OUT_OF_SOURCE_BUILD) ENDIF(VISIT_OUT_OF_SOURCE_BUILD)
ENDIF(NOT WIN32 AND IS_DIRECTORY ${VISIT_SOURCE_DIR}/../data) ENDIF(IS_DIRECTORY ${VISIT_SOURCE_DIR}/../data)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Create library dependencies file # Create library dependencies file
...@@ -1797,6 +1810,10 @@ ELSE (NOT WIN32) ...@@ -1797,6 +1810,10 @@ ELSE (NOT WIN32)
ADD_CUSTOM_TARGET(_PACKAGE ALL DEPENDS visit${VISIT_VERSION}.exe) ADD_CUSTOM_TARGET(_PACKAGE ALL DEPENDS visit${VISIT_VERSION}.exe)
ADD_CUSTOM_COMMAND(TARGET _PACKAGE PRE_BUILD ADD_CUSTOM_COMMAND(TARGET _PACKAGE PRE_BUILD
COMMAND ${CMAKE_COMMAND} -DBUILD_TYPE=${CMAKE_CFG_INTDIR} -P cmake_install.cmake) COMMAND ${CMAKE_COMMAND} -DBUILD_TYPE=${CMAKE_CFG_INTDIR} -P cmake_install.cmake)
IF(IS_DIRECTORY ${VISIT_SOURCE_DIR}/../data)
ADD_CUSTOM_COMMAND(TARGET _PACKAGE PRE_BUILD
COMMAND ${CMAKE_COMMAND} -DBUILD_TYPE=${CMAKE_CFG_INTDIR} -P ${VISIT_BINARY_DIR}/data/cmake_install.cmake)
ENDIF(IS_DIRECTORY ${VISIT_SOURCE_DIR}/../data)
SET_TARGET_PROPERTIES(_PACKAGE PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1) SET_TARGET_PROPERTIES(_PACKAGE PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
......
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