Commit 24b38d75 authored by Ben Boeckel's avatar Ben Boeckel

silo: port

parent fb8bda41
Pipeline #23618 passed with stage
.git* export-ignore
.hooks* export-ignore
*.sh crlf=input
*.sh.in crlf=input
newalpha crlf=input
newversion crlf=input
pvblot.in crlf=input
pre-commit crlf=input
*.bat whitespace=-tab-in-indent,-blank-at-eol
*.sln whitespace=-tab-in-indent,-blank-at-eol
*.vcproj whitespace=-tab-in-indent,-blank-at-eol
*.c whitespace=tab-in-indent,-blank-at-eol
*.h whitespace=tab-in-indent,-blank-at-eol
*.cxx whitespace=tab-in-indent,-blank-at-eol
*.hxx whitespace=tab-in-indent,-blank-at-eol
*.txx whitespace=tab-in-indent,-blank-at-eol
*.txt whitespace=tab-in-indent,-blank-at-eol
*.cmake whitespace=tab-in-indent,-blank-at-eol
*.c hooks.MaxObjectKiB=0
*.md whitespace=tab-in-indent conflict-marker-size=30
*.patch -whitespace -text
*.patch -whitespace -text
......@@ -12,16 +12,6 @@ mark_as_advanced(TRUST_SVN_CERTIFICATES_AUTOMATICALLY)
#option(PV_COMMAND_LINE_TOOLS_ONLY
# "Turn this ON to build command lines tools alone." OFF)
if (WIN32)
if ( (NOT "${CMAKE_GENERATOR}" MATCHES "^NMake.*$") OR
(NOT "${CMAKE_GENERATOR}" MATCHES "^Visual Studio.*$"))
# not use VS environment. We need to be pointed to nmake and devenv paths
# since they are needed when building tools (qt, python, etc.)
find_program(DEVENV_PATH devenv)
mark_as_advanced(DEVENV_PATH)
endif()
endif()
option(USE_NONFREE_COMPONENTS "Enable the non-free parts of the superbuild" OFF)
mark_as_advanced(USE_NONFREE_COMPONENTS)
......
This diff is collapsed.
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="pdb_detect"
ProjectGUID="{17857422-AD82-4D37-A5AF-94C4556935D0}"
RootNamespace="pdb_detect"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(ProjectDir)$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="..\NO_SEC_DEP.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="cd ..\..\&#x0D;&#x0A;copysilo.bat&#x0D;&#x0A;"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Create pdbform.h, lite_pdb.h, lite_score.h"
CommandLine="$(OutDir)\pdb_detect.exe &gt; ..\..\..\src\pdb\pdform.h&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="..\NO_SEC_DEP.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="cd ..\..\&#x0D;&#x0A;copysilo.bat&#x0D;&#x0A;"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Create pdbform.h, lite_pdb.h, lite_score.h."
CommandLine="&quot;$(OutDir)\pdb_detect.exe&quot; &gt; ..\..\..\src\pdb\pdform.h&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\..\src\pdb\detect.c"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
if(BUILD_SHARED_LIBS)
set(shared_args --enable-shared --disable-static)
else()
set(shared_args --disable-shared --enable-static)
endif()
add_external_project(
silo
DEPENDS zlib hdf5
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND <SOURCE_DIR>/configure
--prefix=<INSTALL_DIR>
${shared_args}
--enable-fortran=no
--enable-browser=no
--enable-silex=no
--with-szlib=<INSTALL_DIR>
--with-hdf5=<INSTALL_DIR>/include,<INSTALL_DIR>/lib
)
# INPUT VARIABLES:
# SILO_PATCHES_DIR
# 64BIT_BUILD
# SILO_SOURCE_DIR
# SILO_INSTALL_DIR
# DEVENV_PATH
if (64BIT_BUILD)
set(ENV{ZLIB_INC_DIR} "\"${SILO_INSTALL_DIR}/include\"")
set(ENV{ZLIB_LIB_DIR_X64} "\"${SILO_INSTALL_DIR}/lib\"")
set(ENV{HDF5_INC_DIR_X64} "\"${SILO_INSTALL_DIR}/include\"")
set(ENV{HDF5_LIB_DIR_X64} "\"${SILO_INSTALL_DIR}/lib\"")
set(silo_configuration "Release|x64")
else()
set(ENV{ZLIB_INC_DIR} "\"${SILO_INSTALL_DIR}/include\"")
set(ENV{ZLIB_LIB_DIR} "\"${SILO_INSTALL_DIR}/lib\"")
set(ENV{HDF5_INC_DIR} "\"${SILO_INSTALL_DIR}/include\"")
set(ENV{HDF5_LIB_DIR} "\"${SILO_INSTALL_DIR}/lib\"")
set(silo_configuration "Release|Win32")
endif()
execute_process(
COMMAND ${DEVENV_PATH} "${SILO_SOURCE_DIR}/SiloWindows/MSVC9/SiloWindows.sln" /Upgrade
WORKING_DIRECTORY "${SILO_SOURCE_DIR}"
RESULT_VARIABLE res0)
execute_process(
COMMAND ${DEVENV_PATH} "${SILO_SOURCE_DIR}/SiloWindows/MSVC9/SiloWindows.sln"
/build ${silo_configuration} /project Silo
WORKING_DIRECTORY "${SILO_SOURCE_DIR}"
RESULT_VARIABLE res2)
if(NOT ${res0} EQUAL 0 OR NOT ${res2} EQUAL 0)
message("Silo Errors detected: \n${Silo_OUT}\n${Silo_ERR}")
message(FATAL_ERROR "Error in build of Silo")
endif()
add_external_project(
silo
DEPENDS zlib hdf5
BUILD_IN_SOURCE 1
PATCH_COMMAND
${CMAKE_COMMAND} -DSILO_PATCHES_DIR:PATH=${SuperBuild_PROJECTS_DIR}/patches/silo_win32
-D64BIT_BUILD:BOOL=${64bit_build}
-DSILO_SOURCE_DIR:PATH=<SOURCE_DIR>
-DSILO_INSTALL_DIR:PATH=<INSTALL_DIR>
-P ${CMAKE_CURRENT_LIST_DIR}/silo.patch.cmake
CONFIGURE_COMMAND
${CMAKE_COMMAND} -DSILO_PATCHES_DIR:PATH=${SuperBuild_PROJECTS_DIR}/patches/silo_win32
-D64BIT_BUILD:BOOL=${64bit_build}
-DSILO_SOURCE_DIR:PATH=<SOURCE_DIR>
-DSILO_INSTALL_DIR:PATH=<INSTALL_DIR>
-P ${CMAKE_CURRENT_LIST_DIR}/silo.configure.cmake
BUILD_COMMAND
${CMAKE_COMMAND} -DSILO_PATCHES_DIR:PATH=${SuperBuild_PROJECTS_DIR}/patches/silo_win32
-D64BIT_BUILD:BOOL=${64bit_build}
-DSILO_SOURCE_DIR:PATH=<SOURCE_DIR>
-DSILO_INSTALL_DIR:PATH=<INSTALL_DIR>
-DDEVENV_PATH:FILEPATH=${DEVENV_PATH}
-P ${CMAKE_CURRENT_LIST_DIR}/silo.build.cmake
INSTALL_COMMAND
${CMAKE_COMMAND} -DSILO_PATCHES_DIR:PATH=${SuperBuild_PROJECTS_DIR}/patches/silo_win32
-D64BIT_BUILD:BOOL=${64bit_build}
-DSILO_SOURCE_DIR:PATH=<SOURCE_DIR>
-DSILO_INSTALL_DIR:PATH=<INSTALL_DIR>
-P ${CMAKE_CURRENT_LIST_DIR}/silo.install.cmake
)
add_extra_cmake_args(
-DSILO_INCLUDE_DIR:PATH=${install_location}/include
-DSILO_LIBRARY:FILEPATH=${install_location}/lib/silohdf5.lib)
# INPUT VARIABLES:
# SILO_PATCHES_DIR
# 64BIT_BUILD
# SILO_SOURCE_DIR
# SILO_INSTALL_DIR
if (64BIT_BUILD)
set(silo_bin_dir SiloWindows/MSVC9/x64/Release)
else()
set(silo_bin_dir SiloWindows/MSVC9/Win32/Release)
endif()
execute_process(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${SILO_SOURCE_DIR}/${silo_bin_dir}/silohdf5.lib"
"${SILO_INSTALL_DIR}/lib/silohdf5.lib"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${SILO_SOURCE_DIR}/${silo_bin_dir}/silohdf5.dll"
"${SILO_INSTALL_DIR}/bin/silohdf5.dll"
# There's a config.h file in this directory that we shouldn't install.
# That causes build problems with other projects.
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${SILO_SOURCE_DIR}/SiloWindows/include/silo.h"
"${SILO_INSTALL_DIR}/include/silo.h"
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${SILO_SOURCE_DIR}/SiloWindows/include/siloversion.h"
"${SILO_INSTALL_DIR}/include/siloversion.h"
)
# INPUT VARIABLES:
# SILO_PATCHES_DIR
# 64BIT_BUILD
# SILO_SOURCE_DIR
# SILO_INSTALL_DIR
# set configure environment.
set(ENV{ZLIB_INC_DIR} "\"${SILO_INSTALL_DIR}/include\"")
set(ENV{ZLIB_LIB_DIR} "\"${SILO_INSTALL_DIR}/lib\"")
set(ENV{HDF5_INC_DIR} "\"${SILO_INSTALL_DIR}/include\"")
set(ENV{HDF5_LIB_DIR} "\"${SILO_INSTALL_DIR}/lib\"")
execute_process(
# this file contains quotation patches to handle executing pdb_detect.exe when
# it in a directory with spaces and remove perl.exe
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${SILO_PATCHES_DIR}/pdb_detect.vcproj"
"${SILO_SOURCE_DIR}/SiloWindows/MSVC9/pdb_detect/pdb_detect.vcproj"
# use zlib instead of zlib1
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${SILO_PATCHES_DIR}/Silo.vcproj"
"${SILO_SOURCE_DIR}/SiloWindows/MSVC9/Silo.vcproj"
)
if (BUILD_SHARED_LIBS)
set(silo_shared_args --enable-shared --disable-static)
else ()
set(silo_shared_args --disable-shared --enable-static)
endif ()
superbuild_add_project(silo
DEPENDS zlib hdf5
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND
<SOURCE_DIR>/configure
--prefix=<INSTALL_DIR>
${silo_shared_args}
--enable-fortran=no
--enable-browser=no
--enable-silex=no
--with-szlib=<INSTALL_DIR>
--with-hdf5=<INSTALL_DIR>/include,<INSTALL_DIR>/lib)
diff -Nr -U5 silo-4.9.1-bsd/SiloWindows/MSVC9/pdb_detect/pdb_detect.vcproj silo-4.9.1-bsd.fix-vcproj-quotation/SiloWindows/MSVC9/pdb_detect/pdb_detect.vcproj
--- silo-4.9.1-bsd/SiloWindows/MSVC9/pdb_detect/pdb_detect.vcproj 2013-03-19 13:36:58.000000000 -0400
+++ silo-4.9.1-bsd.fix-vcproj-quotation/SiloWindows/MSVC9/pdb_detect/pdb_detect.vcproj 2015-12-02 16:27:43.801630544 -0500
@@ -29,11 +29,11 @@
WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\..\&#x0D;&#x0A;copysilo.bat"
+ CommandLine="cd ..\..\&#x0D;&#x0A;copysilo.bat&#x0D;&#x0A;"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
@@ -94,11 +94,11 @@
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Create pdbform.h, lite_pdb.h, lite_score.h"
- CommandLine="$(OutDir)\pdb_detect.exe &gt; ..\..\..\src\pdb\pdform.h&#x0D;&#x0A;perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\pdb\pdb.h $(SolutionDir)..\include\lite_pdb.h&#x0D;&#x0A;perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\score\score.h $(SolutionDir)..\include\lite_score.h"
+ CommandLine="$(OutDir)\pdb_detect.exe &gt; ..\..\..\src\pdb\pdform.h&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
@@ -109,11 +109,11 @@
WholeProgramOptimization="1"
BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\..\&#x0D;&#x0A;copysilo.bat"
+ CommandLine="cd ..\..\&#x0D;&#x0A;copysilo.bat&#x0D;&#x0A;"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
@@ -175,11 +175,11 @@
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
Description="Create pdbform.h, lite_pdb.h, lite_score.h."
- CommandLine="$(OutDir)\pdb_detect.exe &gt; ..\..\..\src\pdb\pdform.h&#x0D;&#x0A;perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\pdb\pdb.h $(SolutionDir)..\include\lite_pdb.h&#x0D;&#x0A;perl.exe $(SolutionDir)..\..\config\mklite $(SolutionDir)..\..\src\score\score.h $(SolutionDir)..\include\lite_score.h"
+ CommandLine="&quot;$(OutDir)\pdb_detect.exe&quot; &gt; ..\..\..\src\pdb\pdform.h&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
<References>
</References>
diff -Nr -U5 silo-4.9.1-bsd/SiloWindows/MSVC9/Silo.vcproj silo-4.9.1-bsd.fix-zlib-link/SiloWindows/MSVC9/Silo.vcproj
--- silo-4.9.1-bsd/SiloWindows/MSVC9/Silo.vcproj 2013-03-19 13:36:58.000000000 -0400
+++ silo-4.9.1-bsd.fix-zlib-link/SiloWindows/MSVC9/Silo.vcproj 2015-12-02 16:27:34.534353655 -0500
@@ -21,11 +21,11 @@
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops;.\DepLibs.vsprops"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
>
@@ -80,11 +80,11 @@
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib1.lib hdf5dll.lib"
+ AdditionalDependencies="zlib.lib hdf5.lib"
OutputFile="$(OutDir)\silohdf5.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(ZLIB_LIB_DIR);$(HDF5_LIB_DIR)"
ProgramDatabaseFile="$(OutDir)\silohdf5.pdb"
@@ -109,21 +109,21 @@
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
+ <!-- <Tool
Name="VCPostBuildEventTool"
- CommandLine="copy $(HDF5_LIB_DIR)\hdf5dll.dll $(OutDir)&#x0D;&#x0A;copy $(ZLIB_LIB_DIR)\zlib1.dll $(OutDir)&#x0D;&#x0A;copy $(SZIP_LIB_DIR)\szlibdll.dll $(OutDir)&#x0D;&#x0A;"
- />
+ CommandLine="copy $(HDF5_LIB_DIR)\hdf5.dll $(OutDir)&#x0D;&#x0A;copy $(ZLIB_LIB_DIR)\zlib.dll $(OutDir)&#x0D;&#x0A;copy $(SZIP_LIB_DIR)\szlibdll.dll $(OutDir)&#x0D;&#x0A;"
+ />-->
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops;.\DepLibs.vsprops"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
>
@@ -178,11 +178,11 @@
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib1.lib hdf5dll.lib"
+ AdditionalDependencies="zlib.lib hdf5.lib"
OutputFile="$(OutDir)\silohdf5.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(ZLIB_LIB_DIR_X64);$(HDF5_LIB_DIR_X64)"
ProgramDatabaseFile="$(OutDir)\silohdf5.pdb"
@@ -207,21 +207,21 @@
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
+ <!-- <Tool
Name="VCPostBuildEventTool"
- CommandLine="copy $(HDF5_LIB_DIR_X64)\hdf5dll.dll $(OutDir)&#x0D;&#x0A;copy $(ZLIB_LIB_DIR_X64)\zlib1.dll $(OutDir)&#x0D;&#x0A;copy $(SZIP_LIB_DIR_X64)\szlibdll.dll $(OutDir)&#x0D;&#x0A;"
- />
+ CommandLine="copy $(HDF5_LIB_DIR_X64)\hdf5.dll $(OutDir)&#x0D;&#x0A;copy $(ZLIB_LIB_DIR_X64)\zlib.dll $(OutDir)&#x0D;&#x0A;copy $(SZIP_LIB_DIR_X64)\szlibdll.dll $(OutDir)&#x0D;&#x0A;"
+ />-->
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops;.\DepLibs.vsprops"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
>
@@ -274,11 +274,11 @@
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib1.lib hdf5dll.lib"
+ AdditionalDependencies="zlib.lib hdf5.lib"
OutputFile="$(OutDir)\silohdf5.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(ZLIB_LIB_DIR);$(HDF5_LIB_DIR)"
GenerateDebugInformation="true"
@@ -304,21 +304,21 @@
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
+ <!-- <Tool
Name="VCPostBuildEventTool"
- CommandLine="copy $(HDF5_LIB_DIR)\hdf5dll.dll $(OutDir)&#x0D;&#x0A;copy $(ZLIB_LIB_DIR)\zlib1.dll $(OutDir)&#x0D;&#x0A;copy $(SZIP_LIB_DIR)\szlibdll.dll $(OutDir)&#x0D;&#x0A;"
- />
+ CommandLine="copy $(HDF5_LIB_DIR)\hdf5.dll $(OutDir)&#x0D;&#x0A;copy $(ZLIB_LIB_DIR)\zlib.dll $(OutDir)&#x0D;&#x0A;copy $(SZIP_LIB_DIR)\szlibdll.dll $(OutDir)&#x0D;&#x0A;"
+ />-->
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
- InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops;.\DepLibs.vsprops"
+ InheritedPropertySheets=".\NO_SEC_DEP.vsprops;.\ModernDTPR.vsprops;.\HDF5_Defines.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
BuildLogFile="$(IntDir)\$(ProjectName)_BuildLog.htm"
>
@@ -371,11 +371,11 @@
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="zlib1.lib hdf5dll.lib"
+ AdditionalDependencies="zlib.lib hdf5.lib"
OutputFile="$(OutDir)\silohdf5.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories="$(ZLIB_LIB_DIR_X64);$(HDF5_LIB_DIR_X64)"
GenerateDebugInformation="true"
@@ -401,14 +401,14 @@
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
+ <!--<Tool
Name="VCPostBuildEventTool"
- CommandLine="copy $(HDF5_LIB_DIR_X64)\hdf5dll.dll $(OutDir)&#x0D;&#x0A;copy $(ZLIB_LIB_DIR_X64)\zlib1.dll $(OutDir)&#x0D;&#x0A;copy $(SZIP_LIB_DIR_X64)\szlibdll.dll $(OutDir)&#x0D;&#x0A;"
- />
+ CommandLine="copy $(HDF5_LIB_DIR_X64)\hdf5.dll $(OutDir)&#x0D;&#x0A;copy $(ZLIB_LIB_DIR_X64)\zlib.dll $(OutDir)&#x0D;&#x0A;copy $(SZIP_LIB_DIR_X64)\szlibdll.dll $(OutDir)&#x0D;&#x0A;"
+ />-->
</Configuration>
</Configurations>
<References>
</References>
<Files>
# INPUT VARIABLES:
# 64bit_build
# source_dir
# install_dir
# DEVENV_PATH
if (64bit_build)
set(ENV{ZLIB_INC_DIR} "\"${install_dir}/include\"")
set(ENV{ZLIB_LIB_DIR_X64} "\"${install_dir}/lib\"")
set(ENV{HDF5_INC_DIR_X64} "\"${install_dir}/include\"")
set(ENV{HDF5_LIB_DIR_X64} "\"${install_dir}/lib\"")
set(silo_configuration "Release|x64")
else ()
set(ENV{ZLIB_INC_DIR} "\"${install_dir}/include\"")
set(ENV{ZLIB_LIB_DIR} "\"${install_dir}/lib\"")
set(ENV{HDF5_INC_DIR} "\"${install_dir}/include\"")
set(ENV{HDF5_LIB_DIR} "\"${install_dir}/lib\"")
set(silo_configuration "Release|Win32")
endif ()
execute_process(
COMMAND ${DEVENV_PATH}
"${source_dir}/SiloWindows/MSVC9/SiloWindows.sln"
/Upgrade
WORKING_DIRECTORY "${source_dir}"
RESULT_VARIABLE res_upgrade)
execute_process(
COMMAND ${DEVENV_PATH}
"${source_dir}/SiloWindows/MSVC9/SiloWindows.sln"
/build ${silo_configuration}
/project Silo
WORKING_DIRECTORY "${source_dir}"
RESULT_VARIABLE res_build)
if (res_upgrade OR res_build)
message(FATAL_ERROR "Error building Silo!")
endif ()
# INPUT VARIABLES:
# SILO_PATCHES_DIR
# 64BIT_BUILD
# SILO_SOURCE_DIR
# SILO_INSTALL_DIR
# source_dir
# install_dir
# set configure environment.
set(ENV{ZLIB_INC_DIR} "${SILO_INSTALL_DIR}/include")
set(ENV{ZLIB_LIB_DIR} "${SILO_INSTALL_DIR}/lib")
set(ENV{HDF5_INC_DIR} "${SILO_INSTALL_DIR}/include")
set(ENV{HDF5_LIB_DIR} "${SILO_INSTALL_DIR}/lib")
set(ENV{ZLIB_INC_DIR} "${install_dir}/include")
set(ENV{ZLIB_LIB_DIR} "${install_dir}/lib")
set(ENV{HDF5_INC_DIR} "${install_dir}/include")
set(ENV{HDF5_LIB_DIR} "${install_dir}/lib")
execute_process(
COMMAND copysilo.bat
WORKING_DIRECTORY "${SILO_SOURCE_DIR}/SiloWindows"
WORKING_DIRECTORY "${source_dir}/SiloWindows"
RESULT_VARIABLE res)
if ("${res}" STREQUAL "0")
if (NOT res)
message(STATUS "Silo configured successfully")
else ()
message(STATUS "Silo configuration failed.")
message(FATAL_ERROR "Silo configuration failed.")
endif()
# INPUT VARIABLES:
# 64bit_build
# source_dir
# install_dir
if (64bit_build)
set(silo_bin_dir SiloWindows/MSVC9/x64/Release)
else ()
set(silo_bin_dir SiloWindows/MSVC9/Win32/Release)
endif ()
configure_file(
"${source_dir}/${silo_bin_dir}/silohdf5.lib"
"${install_dir}/lib/silohdf5.lib"
COPYONLY)
configure_file(
"${source_dir}/${silo_bin_dir}/silohdf5.dll"
"${install_dir}/bin/silohdf5.dll"
COPYONLY)
# There's a config.h file in this directory that we shouldn't install. That
# causes build problems with other projects.
configure_file(
"${source_dir}/SiloWindows/include/silo.h"
"${install_dir}/include/silo.h"
COPYONLY)