summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2015-04-01 21:02:43 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2015-04-01 21:02:43 (GMT)
commit99baa66184cdf358d1e598351008baa22e1ebd37 (patch)
treeed8f8317cdcbaed6cb188cacf9de55b34ae1f718 /test
parentf6d9d1fdc884731a1fef0b0921b549cd6aa2bd0e (diff)
downloadhdf5-99baa66184cdf358d1e598351008baa22e1ebd37.zip
hdf5-99baa66184cdf358d1e598351008baa22e1ebd37.tar.gz
hdf5-99baa66184cdf358d1e598351008baa22e1ebd37.tar.bz2
[svn-r26699] Generators are only built static
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt4
-rw-r--r--test/CMakeTests.cmake4
2 files changed, 4 insertions, 4 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 05f59bb..55b3c44 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -308,8 +308,8 @@ endif (\${TEST_RESULT} STREQUAL \"0\")
##############################################################################
if (BUILD_SHARED_LIBS)
add_executable (plugin ${HDF5_TEST_SOURCE_DIR}/plugin.c)
- TARGET_NAMING (plugin ${LIB_TYPE})
- TARGET_C_PROPERTIES (plugin ${LIB_TYPE} " " " ")
+ TARGET_NAMING (plugin SHARED)
+ TARGET_C_PROPERTIES (plugin SHARED " " " ")
target_link_libraries (plugin ${HDF5_TEST_PLUGIN_LIB_TARGET})
set_target_properties (plugin PROPERTIES FOLDER test)
endif (BUILD_SHARED_LIBS)
diff --git a/test/CMakeTests.cmake b/test/CMakeTests.cmake
index 7854b2a..92e4574 100644
--- a/test/CMakeTests.cmake
+++ b/test/CMakeTests.cmake
@@ -727,8 +727,8 @@ endif (HDF5_TEST_VFD)
if (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
MACRO (ADD_H5_GENERATOR genfile)
add_executable (${genfile} ${HDF5_TEST_SOURCE_DIR}/${genfile}.c)
- TARGET_NAMING (${genfile} ${LIB_TYPE})
- TARGET_C_PROPERTIES (${genfile} ${LIB_TYPE} " " " ")
+ TARGET_NAMING (${genfile} STATIC)
+ TARGET_C_PROPERTIES (${genfile} STATIC " " " ")
target_link_libraries (${genfile} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
set_target_properties (${genfile} PROPERTIES FOLDER generator/test)
ENDMACRO (ADD_H5_GENERATOR genfile)