Update config files and scripts.

Added a logger plugin directory symbol.
Kitware · Jul 24, 2018 · 651718a · 651718a
1 parent ef42738
commit 651718a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/CMake/setup_KWIVER.bat.in b/CMake/setup_KWIVER.bat.in
@@ -7,7 +7,7 @@
 :: where as an install directory does not (bin/*.dlls)
 if exist %~dp0/bin/kwiversys.dll (
   set config=
-  
+
   if not [%1] == [] echo setting up an install directory, ignoring provided configuration.
   GOTO Start
 )
@@ -24,7 +24,7 @@ set config=release
 
 set PATH=%~dp0/bin/%config%;%~dp0/lib/%config%/modules;%~dp0/lib/%config%/sprokit;%~dp0/lib/sprokit/%config%;@EXTRA_WIN32_PATH@
 
-set KWIVER_PLUGIN_PATH=%~dp0/lib/%config%/modules;%~dp0/lib/%config%/sprokit;%~dp0/lib/sprokit/%config%
+set KWIVER_PLUGIN_PATH=%~dp0/lib/%config%/@kwiver_plugin_module_subdir@;%~dp0/lib/%config%/sprokit;%~dp0/lib/@kwiver_plugin_process_subdir@/%config%
 
 :: Set default log reporting level for default logger.
 :: set KWIVER_DEFAULT_LOG_LEVEL=info

diff --git a/CMake/setup_KWIVER.sh.in b/CMake/setup_KWIVER.sh.in
@@ -6,7 +6,7 @@ this_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 export VG_PLUGIN_PATH=$this_dir
 export PATH=$this_dir/bin:$PATH
 export @LIBRARY_PATH_VAR@=$this_dir/lib:$@LIBRARY_PATH_VAR@
-export KWIVER_PLUGIN_PATH=$this_dir/lib/modules:$this_dir/lib/sprokit:$KWIVER_PLUGIN_PATH
+export KWIVER_PLUGIN_PATH=$this_dir/lib/@kwiver_plugin_module_subdir@:$this_dir/lib/@kwiver_plugin_process_subdir@:$KWIVER_PLUGIN_PATH
 
 # Set default log reporting level for default logger.
 # export KWIVER_DEFAULT_LOG_LEVEL=info

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -129,6 +129,7 @@ set( kwiver_plugin_process_instrumentation_subdir kwiver/modules ) # with module
 set( kwiver_plugin_scheduler_subdir               kwiver/processes ) # with processes for now
 set( kwiver_plugin_module_subdir                  kwiver/modules )
 set( kwiver_plugin_plugin_explorer_subdir         kwiver/modules/plugin_explorer )
+set( kwiver_plugin_logger_subdir                  kwiver/modules )
 
 ##
 # System specific compiler flags
@@ -230,7 +231,7 @@ file( COPY log4cxx.properties       DESTINATION  "${KWIVER_BINARY_DIR}" )
 install( FILES log4cxx.properties   DESTINATION ${CMAKE_INSTALL_PREFIX} )
 
 if ( KWIVER_ENABLE_LOG4CXX )
-  file( APPEND "${KWIVER_SETUP_SCRIPT_FILE}" "export VITAL_LOGGER_FACTORY=$this_dir/lib/modules/vital_log4cxx_logger\n" )
+  file( APPEND "${KWIVER_SETUP_SCRIPT_FILE}" "export VITAL_LOGGER_FACTORY=$this_dir/lib/${kwiver_plugin_logger_subdir}/vital_log4cxx_logger\n" )
   file( APPEND "${KWIVER_SETUP_SCRIPT_FILE}" "export LOG4CXX_CONFIGURATION=$this_dir/log4cxx.properties\n" )
   if(WIN32)
     message(STATUS "Log4CXX is not supported on windows, if no other logger is provided, the default will be used")
@@ -243,7 +244,7 @@ file( COPY log4cplus.properties       DESTINATION  "${KWIVER_BINARY_DIR}" )
 install( FILES log4cplus.properties   DESTINATION ${CMAKE_INSTALL_PREFIX} )
 
 if ( KWIVER_ENABLE_LOG4CPLUS )
-  file( APPEND "${KWIVER_SETUP_SCRIPT_FILE}" "export VITAL_LOGGER_FACTORY=$this_dir/lib/modules/vital_log4cplus_logger\n" )
+  file( APPEND "${KWIVER_SETUP_SCRIPT_FILE}" "export VITAL_LOGGER_FACTORY=$this_dir/lib/${kwiver_plugin_logger_subdir}/vital_log4cplus_logger\n" )
   file( APPEND "${KWIVER_SETUP_SCRIPT_FILE}" "export LOG4CPLUS_CONFIGURATION=$this_dir/log4cplus.properties\n" )
 
   file( APPEND "${KWIVER_SETUP_BATCH_FILE}" "set VITAL_LOGGER_FACTORY=vital_log4cplus_logger\n" )

diff --git a/sprokit/src/sprokit/pipeline/CMakeLists.txt b/sprokit/src/sprokit/pipeline/CMakeLists.txt
@@ -48,12 +48,11 @@ set(pipeline_headers
 
 set(pipeline_private_headers)
 
-kwiver_make_module_path( ${CMAKE_INSTALL_PREFIX} sprokit )
+kwiver_make_module_path( ${CMAKE_INSTALL_PREFIX} ${kwiver_plugin_process_subdir} )
 set( sprokit_default_module_paths ${kwiver_module_path_result} )
 
-
 if (KWIVER_USE_BUILD_TREE)
-  kwiver_make_module_path( ${sprokit_output_dir} sprokit )
+  kwiver_make_module_path( ${sprokit_output_dir} ${kwiver_plugin_process_subdir} )
   list( INSERT sprokit_default_module_paths 0 "${kwiver_module_path_result}" )
 endif ()
 

diff --git a/vital/CMakeLists.txt b/vital/CMakeLists.txt
@@ -234,11 +234,11 @@ endif()
 # Build a default set of plugin path dirs
 # Provide that list as the default value for the path option.
 
-kwiver_make_module_path( ${CMAKE_INSTALL_PREFIX} modules )
+kwiver_make_module_path( ${CMAKE_INSTALL_PREFIX} ${kwiver_plugin_module_subdir} )
 set( vital_default_module_path ${kwiver_module_path_result} )
 
 if (KWIVER_USE_BUILD_TREE)
-  kwiver_make_module_path( ${KWIVER_BINARY_DIR} modules )
+  kwiver_make_module_path( ${KWIVER_BINARY_DIR} ${kwiver_plugin_module_subdir} )
   set( vital_default_module_path ${kwiver_module_path_result} ${vital_default_module_path} )
 endif()
 

diff --git a/vital/logger/CMakeLists.txt b/vital/logger/CMakeLists.txt
@@ -65,7 +65,7 @@ if (KWIVER_ENABLE_LOG4CXX)
     SOURCES          log4cxx_factory.cxx
     PRIVATE          ${log4cxx_lib}
                      kwiversys vital_logger
-    SUBDIR           ${kwiver_plugin_module_subdir}
+    SUBDIR           ${kwiver_plugin_logger_subdir}
     )
 
 kwiver_install_headers(
@@ -86,7 +86,7 @@ if (KWIVER_ENABLE_LOG4CPLUS)
     PRIVATE          ${log4cplus_lib}
                      kwiversys vital_logger
                      log4cplus::log4cplus
-    SUBDIR           ${kwiver_plugin_module_subdir}
+    SUBDIR           ${kwiver_plugin_logger_subdir}
     )
 
 kwiver_install_headers(