Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xdmf
Xdmf
Commits
066763ba
Commit
066763ba
authored
Jul 25, 2011
by
Brian Panneton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added support to build on Win7 VS2010
parent
5d359189
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
26 deletions
+44
-26
CMakeLists.txt
CMakeLists.txt
+35
-20
core/CMakeLists.txt
core/CMakeLists.txt
+9
-6
No files found.
CMakeLists.txt
View file @
066763ba
project
(
Xdmf
)
cmake_minimum_required
(
VERSION 2.6
)
if
(
MSVC10
)
SET
(
CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE
${
CMAKE_BINARY_DIR
}
)
SET
(
CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE
${
CMAKE_BINARY_DIR
}
)
SET
(
CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE
${
CMAKE_BINARY_DIR
}
)
endif
(
MSVC10
)
set
(
BUILD_SHARED_LIBS true
)
include_directories
(
${
CMAKE_CURRENT_SOURCE_DIR
}
)
include_directories
(
${
CMAKE_BINARY_DIR
}
)
...
...
@@ -75,12 +81,15 @@ if(XDMF_WRAP_PYTHON)
endif
(
"
${
ARGN
}
"
STRGREATER
""
)
if
(
WIN32
)
set_target_properties
(
${
SWIG_MODULE_
${
python_name
}
_REAL_NAME
}
PROPERTIES
PREFIX ../
RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
LIBRARY_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
ARCHIVE_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
)
if
(
NOT MSVC10
)
set_target_properties
(
${
SWIG_MODULE_
${
python_name
}
_REAL_NAME
}
PROPERTIES
PREFIX ../
IMPORT_PREFIX ../
RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
LIBRARY_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
ARCHIVE_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
)
endif
(
NOT MSVC10
)
endif
(
WIN32
)
string
(
TOUPPER
${
python_name
}
python_name_upper
)
...
...
@@ -128,12 +137,15 @@ if(XDMF_WRAP_JAVA)
swig_link_libraries
(
${
java_name
}
Java
${
java_name
}
)
if
(
WIN32
)
set_target_properties
(
${
SWIG_MODULE_
${
java_name
}
Java_REAL_NAME
}
PROPERTIES
PREFIX ../
RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
LIBRARY_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
ARCHIVE_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
)
if
(
NOT MSVC10
)
set_target_properties
(
${
SWIG_MODULE_
${
java_name
}
Java_REAL_NAME
}
PROPERTIES
PREFIX ../
IMPORT_PREFIX ../
RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
LIBRARY_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
ARCHIVE_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
)
endif
(
NOT MSVC10
)
set
(
java_files *.java
)
set
(
java_dest
"bin"
)
set
(
separator
"
\;
"
)
...
...
@@ -215,14 +227,17 @@ if(NOT XDMF_BUILD_CORE_ONLY)
target_link_libraries
(
Xdmf XdmfCore
)
if
(
WIN32
)
set_target_properties
(
Xdmf PROPERTIES
DEFINE_SYMBOL Xdmf_EXPORTS
PREFIX ../
IMPORT_PREFIX ../
RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
LIBRARY_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
ARCHIVE_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
)
endif
(
WIN32
)
set_target_properties
(
Xdmf PROPERTIES
DEFINE_SYMBOL Xdmf_EXPORTS
)
if
(
NOT MSVC10
)
set_target_properties
(
Xdmf PROPERTIES
PREFIX ../
IMPORT_PREFIX ../
RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
LIBRARY_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
ARCHIVE_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
)
endif
(
NOT MSVC10
)
endif
(
WIN32
)
if
(
XDMF_WRAP_JAVA
)
XDMF_SWIG_JAVA
(
Xdmf Compiled_XdmfCore_Jar
)
...
...
core/CMakeLists.txt
View file @
066763ba
...
...
@@ -107,12 +107,15 @@ target_link_libraries(XdmfCore
if
(
WIN32
)
add_definitions
(
-D_HDF5USEDLL_ -D_HDF5USEHLDLL_
)
set_target_properties
(
XdmfCore PROPERTIES
DEFINE_SYMBOL XdmfCore_EXPORTS
PREFIX ../
IMPORT_PREFIX ../
RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
LIBRARY_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
ARCHIVE_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
)
DEFINE_SYMBOL XdmfCore_EXPORTS
)
if
(
NOT MSVC10
)
set_target_properties
(
XdmfCore PROPERTIES
PREFIX ../
IMPORT_PREFIX ../
RUNTIME_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
LIBRARY_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
ARCHIVE_OUTPUT_DIRECTORY
${
CMAKE_BINARY_DIR
}
)
endif
(
NOT MSVC10
)
endif
(
WIN32
)
if
(
XDMF_WRAP_JAVA
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment