diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-01-10 20:39:48 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-01-10 20:39:48 (GMT) |
| commit | 9b5bd45740320693be9749a4db0ae96af50c3374 (patch) | |
| tree | d2e3bc3a4ba27d506c2a59d7023015b205d56a19 | |
| parent | 9cabaf09a8059a969e2f984d84d71597b4bf523b (diff) | |
| download | hdf5-9b5bd45740320693be9749a4db0ae96af50c3374.zip hdf5-9b5bd45740320693be9749a4db0ae96af50c3374.tar.gz hdf5-9b5bd45740320693be9749a4db0ae96af50c3374.tar.bz2 | |
HDFFV-10385 mult-config builders need a folder
| -rw-r--r-- | config/cmake/UseJava.cmake | 2 | ||||
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config/cmake/UseJava.cmake b/config/cmake/UseJava.cmake index 52b37a9..c70f52e 100644 --- a/config/cmake/UseJava.cmake +++ b/config/cmake/UseJava.cmake @@ -285,7 +285,7 @@ # # Example: # create_javadoc(my_example_doc -# PACKAGES com.exmaple.foo com.example.bar +# PACKAGES com.example.foo com.example.bar # SOURCEPATH "${CMAKE_CURRENT_SOURCE_DIR}" # CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH} # WINDOWTITLE "My example" diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 218c882..76e0612 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -17,12 +17,11 @@ macro (SET_HDF5_BUILD_TYPE) set(HDF5_BUILD_TYPE ${CMAKE_CFG_INTDIR}) set(HDF5_CFG_BUILD_TYPE \${CMAKE_INSTALL_CONFIG_NAME}) else() + set(HDF5_CFG_BUILD_TYPE ".") if(CMAKE_BUILD_TYPE) set(HDF5_BUILD_TYPE ${CMAKE_BUILD_TYPE}) - set(HDF5_CFG_BUILD_TYPE ${CMAKE_BUILD_TYPE}) else() set(HDF5_BUILD_TYPE "Release") - set(HDF5_CFG_BUILD_TYPE "Release") endif() endif() endmacro () |