diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2014-04-02 18:35:01 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2014-04-02 18:35:01 (GMT) |
| commit | 98bbf4a36a2410fe0862c739370365a160053f17 (patch) | |
| tree | c07dd05d13fe3729d677ffe82be9d2a662035467 /bin/cmakehdf5 | |
| parent | 5555f057ae4203b469cc22c6fc9bf886ff809343 (diff) | |
| download | hdf5-98bbf4a36a2410fe0862c739370365a160053f17.zip hdf5-98bbf4a36a2410fe0862c739370365a160053f17.tar.gz hdf5-98bbf4a36a2410fe0862c739370365a160053f17.tar.bz2 | |
[svn-r24948] Group tests by Common name
Remove WIN32 AND NOT CYGWIN if blocks - should be just WIN32
Tested: local linux CMake
Diffstat (limited to 'bin/cmakehdf5')
| -rwxr-xr-x | bin/cmakehdf5 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5 index 1150994..5da3cca 100755 --- a/bin/cmakehdf5 +++ b/bin/cmakehdf5 @@ -101,16 +101,16 @@ echo Running Cmake for HDF5-${version} ... # 4. Configure the C library, tools and tests with this command: STEP "Configure..." "cmake -G 'Unix Makefiles' -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ../hdf5" $configlog -# 3. Build the C library, tools and tests with this command: +# 5. Build the C library, tools and tests with this command: STEP "Build the library, tools and tests, ..." "cmake --build . --config Release" $makelog -# 4. Test the C library and tools with this command: +# 6. Test the C library and tools with this command: STEP "Test the library and tools..." "ctest . -C Release" $testlog -# 5. Create an install image with this command: +# 7. Create an install image with this command: STEP "Create an install image..." "cpack -C Release CPackConfig.cmake" $packlog -# 6. Install with this command: +# 8. Install with this command: STEP "Install..." "./HDF5-${version}-Linux.sh --skip-license" $installlog # save the last exit code exit_code=$? @@ -199,7 +199,7 @@ set (SITE_BUILDNAME_SUFFIX "cmakehdf5") set (LOCAL_SKIP_UPDATE TRUE) set (REPOSITORY_URL "http://svn.hdfgroup.uiuc.edu/hdf5/branches/hdf5_1_8") # -- Standard build options -set (ADD_BUILD_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=/usr/local/hdf5.1.8 -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=\"SVN\" -DHDF5_PACKAGE_EXTLIBS:BOOL=ON") +set (ADD_BUILD_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=${CTEST_BINARY_DIRECTORY} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING=\"SVN\" -DHDF5_PACKAGE_EXTLIBS:BOOL=ON") # Use multiple CPU cores to build include(ProcessorCount) |