Commit Graph

196 Commits

Author SHA1 Message Date
Allen Byrne
a6d5efaf89 [svn-r21834] Updated jpeg so version and lib packaging macros
Synch with all projects
2011-12-20 11:11:07 -05:00
Allen Byrne
cc3eb8da73 [svn-r21804] Update CMake Required version in all folders to match current standard 2.8.6 2011-12-05 11:19:09 -05:00
Allen Byrne
a529e1ae55 [svn-r21787] Unify CMake config macros, split base macros from ext lib macros
Tested: local linux
2011-12-01 09:13:44 -05:00
Allen Byrne
0d561e64fe [svn-r21786] remove HDF_LEGACY option for lib naming on windows 2011-11-30 23:12:16 -05:00
Allen Byrne
32f91a685b [svn-r21783] Correct macros for building static libs on linux when CMAKE_BUILD_TYPE is defined.
Also correct use of CMAKE_ANSI_FLAGS for passing into sub-projects.
2011-11-30 15:28:47 -05:00
Allen Byrne
4c5c484b99 [svn-r21715] Correct SET_TARGET_PROPERTIES commands 2011-11-04 12:31:32 -05:00
Allen Byrne
677380aa5a [svn-r21705] CMake FindMPI module uses <lang> in variables, change use from MPI_XXX to MPI_C_XXX.
Tested: local windows
2011-11-02 15:39:31 -05:00
Allen Byrne
c5e075851a [svn-r21667] Update FOLDER solution option for target properties. Added OPTION command for solution folder and no packaging.
Tested: local linux
2011-10-25 11:52:58 -05:00
Dana Robinson
fa4ab23b9e [svn-r21664] Added solution folders for most of the projects. This still needs some polish - the solution folder assignment should go closer to the target declaration and not all projects are grouped (parallel, c++, fortran, hl, and a few others).
Tested on Windows.
2011-10-25 01:59:10 -05:00
Allen Byrne
cd38a32601 [svn-r21593] Add CMake option to disable packaging component: needed to avoid configuration warning when using Visual Studio Express versions on windows.
Tested: Bangan
2011-10-17 14:49:06 -05:00
Dana Robinson
b2e5e9978d [svn-r21538] Removed obsolete Windows STDIO VFD configuration options from CMake config files.
Tested on Windows
2011-10-13 07:45:56 -05:00
Allen Byrne
1f115749c4 [svn-r21481] Add option to enable windows stdio 2011-10-06 14:25:13 -05:00
Allen Byrne
cb06ebf08d [svn-r21417] Correct indentation in cmake config file.
Add option for allowing -fPIC.
2011-09-26 08:56:42 -05:00
Allen Byrne
13426d47fe [svn-r21263] Add F2003 support to CMake builds 2011-08-19 10:11:10 -05:00
Allen Byrne
215c872226 [svn-r21256] Add libinfo and test to cmake - JIRA 1243
Tested: local linux
2011-08-18 15:59:00 -05:00
Allen Byrne
5f232b2c91 [svn-r21171] Commit HDFFV-5929 winthreads define fix
Change reference of generated executables in src and fortran/src to use $<TARGETFILE:xxx> format.

Tested: local linux
2011-08-04 10:21:15 -05:00
Allen Byrne
fe9ba82949 [svn-r21037] Assign cmake config files to an install group 2011-06-27 16:23:16 -05:00
Allen Byrne
243cf5ce6c [svn-r20899] Add soversion handling - use config/lt_vers.am file.
Bring r20895 from 1.8
2011-05-25 09:57:16 -05:00
Allen Byrne
089e81e86a [svn-r20862] Adjust CPack configuration location by removing version extension in folder name. Add install configuration commands if ext libs are packaged with project. 2011-05-18 12:50:32 -05:00
Allen Byrne
29411fc602 [svn-r20853] Add CPack commands to properly include extlibs into package
Tested: windows
2011-05-17 17:12:36 -05:00
Allen Byrne
05ee8cdd18 [svn-r20808] Add Using_CMake.txt file to docs and install 2011-05-13 09:11:52 -05:00
Allen Byrne
2ee1841187 [svn-r20721] Refactor ext lib import and install.
Add SOVERSION for linux
2011-05-04 14:42:03 -05:00
Allen Byrne
ece690cdb6 [svn-r20717] Refactor ext lib import and install.
Change case of tools subtests to not conflict with tools tests.

Tested: windows, local linux
2011-05-04 11:18:22 -05:00
Allen Byrne
907a5a1df0 [svn-r20713] Packed Bits Merge:
removed option defines and #ifdef/#endif
   refactored all printf to HDfprintf in h5dump.c
   formatted and indention improvements
   synched with 1.8 branch
   
Tested: local linux
2011-05-03 12:56:23 -05:00
Allen Byrne
9e73c8ee3d [svn-r20641] Add CPack overrides for NSIS install paths. Install for products are: HDF Group/Product/Version
Tested: windows , local linux
2011-04-26 14:13:01 -05:00
Allen Byrne
b120aff5cf [svn-r20590] On windows the ext libs did not work for cpack process. Changed ext lib handling to get the correct path. Needs more work to remove the the pre-install copying. 2011-04-21 14:20:23 -05:00
Allen Byrne
27be7d1e2d [svn-r20572] Bug #5929: On windows check for existence of InitOnceExecuteOnce for use by threads.
merge from 1.8 r20568
2011-04-20 13:17:25 -05:00
Allen Byrne
a835d1e65a [svn-r20472] Add message that H5_HAVE_WIN_THREADS requires WINVER >= 0x600 (VISTA or WIN7) 2011-04-11 15:52:09 -05:00
Allen Byrne
09a7dad099 [svn-r20391] Add overlooked condition for external project around packaging section of extlibs 2011-04-01 13:38:31 -05:00
Allen Byrne
378dc5ec28 [svn-r20335] Remove unused windows defines. Add _CONSOLE to windows definitions. 2011-03-25 13:35:07 -05:00
Allen Byrne
ac3b230f0b [svn-r20239] Add HDFGroup to PACKAGE_NAME, as parent folder name for CPack installation configuration. 2011-03-14 11:49:31 -05:00
Allen Byrne
251a65e448 [svn-r20155] Change macros - do not need URL parameter 2011-02-24 15:59:27 -05:00
Allen Byrne
05dfc85de8 [svn-r20153] Move ext lib handling for ext project building to a common macro. Update HDF5 project to use HDFMacros.cmake file. Add test properties for test ordering.
Tested: local linux, windows
2011-02-24 14:43:07 -05:00
Allen Byrne
be50f4a424 [svn-r20151] On windows the name of static zlib library is dependent on the use of HDF_LEGACY_NAMING value when built from SVN/TGZ source. 2011-02-24 06:57:56 -05:00
Allen Byrne
85304e9fee [svn-r20149] Change Name of Legacy naming option 2011-02-23 15:09:55 -05:00
Allen Byrne
5d320f5c89 [svn-r20141] Bring 1.8 r20139 cmake and windows changes to trunk 2011-02-22 09:55:04 -05:00
Allen Byrne
0a15d73625 [svn-r20013] Change use of variable to allow a SITE name to be defined, to using it to extend the build name used in reporting to CDash 2011-01-27 09:59:04 -05:00
Allen Byrne
762ee14a42 [svn-r20002] Add variable to allow a SITE name to be defined
Tested: local linux
2011-01-26 16:00:09 -05:00
Allen Byrne
bf8f584a72 [svn-r19999] Correct typo in check for external library TGZ path define
Tested: local linux
2011-01-26 12:11:23 -05:00
Allen Byrne
c5dd29c7b8 [svn-r19993] Added ability to use compressed file for external libraries corrected.
Tested: local linux
2011-01-25 16:17:54 -05:00
Allen Byrne
e2ff4638f5 [svn-r19991] Added ability to use compressed file for external libraries
Tested: local linux
2011-01-25 15:40:41 -05:00
Allen Byrne
a22b5883b9 [svn-r19949] Correct CPack confusion with the same for two different functions (not case-sensitive) 2011-01-13 14:21:12 -05:00
Allen Byrne
8eb9d884e3 [svn-r19921] Update files for CPack use. 2011-01-06 14:28:19 -05:00
Allen Byrne
1c7688c77a [svn-r19896] remove orphaned endif() 2010-12-30 07:32:07 -05:00
Allen Byrne
86313eb281 [svn-r19895] Remove use of /MT compile flag for building static libs and programs. Added BUILT_AS_STATIC_LIBRARY define to set the windows import/export defines correctly for static libraries. 2010-12-29 13:52:34 -05:00
Allen Byrne
60b5523f8d [svn-r19886] Correct name of file document for Cpack install. 2010-12-13 10:33:18 -05:00
Allen Byrne
624ab27d38 [svn-r19878] Correct HDF5 configuration variables for CPack/Install.
Bring r19875 from 1.8 branch
2010-12-08 15:55:25 -05:00
Allen Byrne
109294e6e2 [svn-r19865] Correct INSTALL_PREFIX handling 2010-12-02 09:31:40 -05:00
Allen Byrne
f8b3d669da [svn-r19854] Correct external library generated headers packing for install/cpack when not using svn builds 2010-11-27 13:38:51 -05:00
Allen Byrne
51fd60955b [svn-r19852] Add back dropped during edit - create directory - for external projects in cpack. 2010-11-26 12:27:53 -05:00
Allen Byrne
8c1b4bc3c7 [svn-r19845] Correct external library generated headers packing for install/cpack 2010-11-25 11:51:40 -05:00
Allen Byrne
f18d822ca5 [svn-r19843] Remove quotes from BLDTYPE parameter in building external projects from svn
Tested: Windows
2010-11-25 10:33:31 -05:00
Allen Byrne
0918e92000 [svn-r19841] Correct external library packing for install/cpack. On windows using shared libs, dlls still needed to be put in the runtime folder for tests. 2010-11-24 11:29:50 -05:00
Allen Byrne
5ab92a43a3 [svn-r19837] Correct external library packing for install/cpack
Tested: Windows
2010-11-23 16:05:39 -05:00
Allen Byrne
186d01285a [svn-r19790] CMake: Correct Error tests. Add Deprecated Symbols option.
Tested: local linux
2010-11-16 11:38:40 -05:00
Allen Byrne
cd7057b21c [svn-r19782] Fix CMake testing for links_env test which requires an environment variable at test run-time. Modified runTest.cmake file to allow optional ENV_VAR and ENV_VALUE to be passed. runTest.cmake requires a reference file, added links_env.out to testfiles folder.
Also updated root CMakeLists.txt to output a message when unsopported options are configured with the PARALLEL option. CMake will still generate files.

Tested: windows and local linux
2010-11-15 11:35:29 -05:00
Allen Byrne
1c45b0eeb5 [svn-r19726] [BZ2072]Add compare output to expected test for help and version options of mkgrp.
Tested: local linux
2010-11-04 15:51:05 -05:00
Allen Byrne
4c38f3fdc7 [svn-r19717] Correct external lib handling for Windows 2010-11-02 16:55:20 -05:00
Allen Byrne
2b0d8d59ae [svn-r19706] Added VFD test options.
Bring r19705 from branch
2010-11-01 17:10:50 -05:00
Allen Byrne
1f27dc4d04 [svn-r19674] MPI_ checks were failing due to wrong #include of mpi.h in cmake setup
From Community
2010-10-27 10:48:57 -05:00
Allen Byrne
9f6fb53aa6 [svn-r19613] Add option command to set flags OFF for if not using ExternalProjects 2010-10-15 13:16:53 -05:00
Allen Byrne
3e7926a35b [svn-r19610] Add missing XXX_USE_EXTERNAL flags for ExternalProjects 2010-10-15 10:32:47 -05:00
Allen Byrne
5f74116522 [svn-r19607] Add message when ExternalProject is built 2010-10-15 09:50:33 -05:00
Allen Byrne
2342d695dc [svn-r19580] Correct target format in ADD_DEPENCIES command 2010-10-12 09:17:15 -05:00
Allen Byrne
293e541644 [svn-r19573] Adjust external library names depending on build type for ExternalProject Command
Tested: local linux, windows
2010-10-11 15:36:03 -05:00
Allen Byrne
91029a6dba [svn-r19570] Parameterize SVN URLs.
Add ExternalProject dependicies of external libs copy on project build.
Force ExternalProject Libs to build release.

Tested: local linux
2010-10-11 10:11:46 -05:00
Allen Byrne
bd9a9e8f4a [svn-r19534] Add using-memchecker option 2010-10-07 11:05:41 -05:00
Allen Byrne
1f2c4afe77 [svn-r19527] Add clear generated objects commands to test blocks.
Add configurefile command to copy CTestCustom to build folder.

Tested: local linux
2010-10-06 15:49:54 -05:00
Allen Byrne
342ce6b589 [svn-r19509] Improve CMake support for CYGWIN.
Correct script comment in testh5diff.sh

Tested: Windows Cygwin
2010-10-04 16:36:27 -05:00
Allen Byrne
e171b57b99 [svn-r19497] Change ExternalProject Dependicies guard to positive match (Windows configure error)
Tested: Windows
2010-09-30 09:31:45 -05:00
Allen Byrne
41fe3ed5cc [svn-r19495] Correct static external project library base names.
Tested: windows
2010-09-29 15:57:47 -05:00
Allen Byrne
4d1741cdab [svn-r19489] Correct dependency on extlib project when not using external projects. 2010-09-29 09:47:44 -05:00
Allen Byrne
3fbd018d8b [svn-r19487] Add ExternalProject support for external libs - option added Defaults to NO. SVN allows downloading project from svn. Future option is to use a tar file.
Tested: Windows, local Linux
2010-09-28 14:02:51 -05:00
Allen Byrne
b4be8ae3d5 [svn-r19434] Correct use of lib, include, bin in INSTALL commands to use proper variables.
Tested: local linux
2010-09-20 15:38:35 -05:00
Allen Byrne
4bae291b1f [svn-r19403] Update to H5REPACK tests for layout info required a grep script like runTest.cmake.
Update CMakeLists.txt for new h5repack  layout tests.

Tested: local linux
2010-09-16 15:31:06 -05:00
Mike McGreevy
b7c2d18029 [svn-r19367] Purpose:
Add windows threads support to HDF5.

Description:

    Added calls to the windows threads library to the H5TS layer, and wrapped
    most calls to either pthreads or windows threads library with portable
    H5TS-style defines. Modified tests to use portable function definitions
    as well.

    This can be configured via CMake with the HDF5_ENABLE_THREADSAFE
    option, and should work on windows vista and later operating systems.

Tested:

    h5committest, plus threadsafe with pthreads on jam and amani,
    and tested on a Windows Vista VM with threadsafe using windows threads.
2010-09-10 11:15:34 -05:00
Allen Byrne
bed1276413 [svn-r19361] Move Windows specific compile and link flags to macros 2010-09-09 11:30:23 -05:00
Allen Byrne
add9f142d4 [svn-r19343] Corrected long long printf test.
Added CMake commands to allow the install of the extlibs on windows.
Updated ctest warning exception regex for VS2010

Tested: windows
2010-09-02 16:00:43 -05:00
Allen Byrne
e65aa8c365 [svn-r19325] Added parallel build commands.
Corrected use/name of source folder aliases.
Duplicated FindMPI.cmake so that non-c++ compiler is found first (recommemded commands did not work).

Tested: local linux with mpich
2010-08-31 15:15:13 -05:00
Allen Byrne
7a009bebff [svn-r19264] Remove configuration of cmake zlib config filed which has been deleted.
Tested: local linux
2010-08-20 10:58:37 -05:00
Allen Byrne
88ebaa5e47 [svn-r19260] Change Cmake to allow a local zlib header to be used in H5Zdelate module.
Corrected use of "SKIP" message in cmake.
Corrections to cmake configuration files (for cmake external projects).

Community suggested changes.

Tested: local linux
2010-08-20 10:37:50 -05:00
Allen Byrne
39b216eb4f [svn-r19225] Moved subfolder checked outside of OPTION command. If folder doesn't exists, there is no reason to have option enabled.
Tested: local linux
2010-08-11 10:06:50 -05:00
Allen Byrne
2a3349fc21 [svn-r19222] Move hl fortran ADD_SUBDIRECTORY to right after fortran ADD_SUBDIRECTORY. This fixes a problem with compiler generated files not including target module directory on some linux machines.
Corrected minor format/location of commands.

Tested: local linux
2010-08-10 15:09:19 -05:00
Allen Byrne
62b85578d8 [svn-r19211] Updated cmake file with community suggested changes for cmake install files.
Removed configure check for fseek

Tested: local linux
2010-08-10 09:23:53 -05:00
Allen Byrne
c1aa958992 [svn-r19201] Added tests that subdirectories exist before using ADD_SUBDIRECTORY CMake command
Added cache set command for default install prefix

Tested: local linux
2010-08-09 12:20:38 -05:00
Allen Byrne
3e87f75822 [svn-r19116] Corrected positioning of cmake variables in definition order. 2010-07-21 09:00:47 -05:00
Allen Byrne
c00ba4b122 [svn-r19107] Move Resources folder to config/cmake
Tested: Local Linux
2010-07-20 10:29:38 -05:00
Allen Byrne
47834df86d [svn-r19056] Added code to retrieve version info from H5public.h; corrected a typo in a configure check and a macro 2010-07-08 08:50:49 -05:00
Allen Byrne
2f13382883 [svn-r19037] Added executable Linker Flag for MSVC static builds: /NODEFAULTLIB:MSVCRT
Added VERSION vars for inclusion into auto snapshot version update script

Tested windows
2010-06-29 15:09:03 -05:00
Allen Byrne
f747973a51 [svn-r19027] Add testing files to cmake resources.
Added code coverage option to cmake.

Tested: local linux
2010-06-22 14:04:20 -05:00
Allen Byrne
15193c18b4 [svn-r18996] Updated config files and install commands per external developers recommendations.
Tested: local linux
2010-06-14 14:08:23 -05:00
Allen Byrne
753f328de1 [svn-r18950] Correct version numbers for trunk 2010-06-02 16:10:41 -05:00
Allen Byrne
9fc29cdd1c [svn-r18925] Updated install of fortran mod files
Tested: local linux
2010-05-28 16:29:01 -05:00
Allen Byrne
ef292895e9 [svn-r18890] Update CMake fortran configure/build with changes from community.
- Add an install rule to copy compiled fortran module files
- Only build the xlatefile utility if testing and tools are enabled
- Don't do MPI HAVE_XXX checks until MPI_FOUND is true
- Install needs H5version.h & H5overflow.h to be copied
- Add debug information flags to debug compile and link lines for win32 Intel compiler
2010-05-25 11:00:56 -05:00
Allen Byrne
80e6dfe3ba [svn-r18856] Added CPack commands for installtion program
Tested: local linux and Windows
2010-05-19 15:11:00 -05:00
Allen Byrne
ae06433ab0 [svn-r18793] Add files to support building library with CMake
Tested: Local linux
2010-05-13 11:01:50 -05:00