Commit a95c0338 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

ParaViewClient: pass shared build information per client

Instead of asking whether ParaView itself was built shared or static,
use the status of the client's build directly.
parent fcf3cc39
......@@ -281,6 +281,11 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n")
PROPERTY
Qt5Core_VERSION_MINOR "${Qt5Core_VERSION_MAJOR}")
set(_paraview_client_built_shared 0)
if (BUILD_SHARED_LIBS)
set(_paraview_client_built_shared 1)
endif ()
set(_paraview_client_source_files
"${CMAKE_CURRENT_BINARY_DIR}/${_paraview_client_NAME}_main.cxx"
"${CMAKE_CURRENT_BINARY_DIR}/pq${_paraview_client_NAME}Initializer.cxx"
......
......@@ -55,6 +55,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#cmakedefine01 _paraview_client_APPLICATION_XMLS
#cmakedefine01 _paraview_client_SPLASH_IMAGE
#cmakedefine01 _paraview_client_TITLE
#cmakedefine01 _paraview_client_built_shared
//-----------------------------------------------------------------------------
pq@_paraview_client_NAME@Initializer::pq@_paraview_client_NAME@Initializer()
......@@ -97,7 +98,7 @@ pq@_paraview_client_NAME@Initializer::Status pq@_paraview_client_NAME@Initialize
return ExitSuccess;
}
#ifndef BUILD_SHARED_LIBS
#if !_paraview_client_built_shared
@_paraview_client_resource_init@
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment