diff --git a/CMakeLists.txt b/CMakeLists.txt index 578ef72e..de5c97d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ option(ITOM_BUILD_SHIPMENT "If ITOM is build for shipment, turn this option ON." if(NOT BUILD_TARGET64) if(WIN32) option(PLUGIN_aerotechA3200 "Build with this plugin." ${ITOM_BUILD_SHIPMENT}) - if(PLUGIN_aerotechA3200) + if(PLUGIN_aerotechA3200 ) add_subdirectory(AerotechA3200) endif(PLUGIN_aerotechA3200) endif() @@ -117,7 +117,7 @@ if(WIN32) endif() # CyUSB -option(PLUGIN_CyUSB "Build with this plugin." ${ITOM_BUILD_SHIPMENT}) +option(PLUGIN_CyUSB "Build with this plugin." ON) if(PLUGIN_CyUSB) add_subdirectory(CyUSB) endif(PLUGIN_CyUSB) @@ -151,7 +151,7 @@ option(PLUGIN_DslrRemote "Build with this plugin." ON) if(PLUGIN_DslrRemote) add_subdirectory(DslrRemote) endif(PLUGIN_DslrRemote) - +C:/Users/fn103196/workspace/itomProject/build # dslrRemote2 option(PLUGIN_DslrRemote2 "Build with this plugin." ON) if(PLUGIN_DslrRemote2) diff --git a/DslrRemote/CMakeLists.txt b/DslrRemote/CMakeLists.txt index d0eaf87a..42508f27 100644 --- a/DslrRemote/CMakeLists.txt +++ b/DslrRemote/CMakeLists.txt @@ -130,4 +130,4 @@ endif() else(WIN32 OR LIBGPHOTO_FOUND) message(SEND_ERROR "LIBGPHOTO_INCLUDE_DIR directory could not be found. ${target_name} will not be build.") -endif() \ No newline at end of file +endif() diff --git a/DslrRemote2/CMakeLists.txt b/DslrRemote2/CMakeLists.txt index d542b11c..a82ce299 100644 --- a/DslrRemote2/CMakeLists.txt +++ b/DslrRemote2/CMakeLists.txt @@ -97,4 +97,3 @@ set(COPY_DESTINATIONS "") itom_add_pluginlibrary_to_copy_list(${target_name} COPY_SOURCES COPY_DESTINATIONS) itom_add_plugin_qm_files_to_copy_list(${target_name} QM_FILES COPY_SOURCES COPY_DESTINATIONS) itom_post_build_copy_files(${target_name} COPY_SOURCES COPY_DESTINATIONS) - diff --git a/OceanOpticsSpec/docs/OceanOpticsSpec.rst b/OceanOpticsSpec/docs/OceanOpticsSpec.rst index 04caf673..4e4d8ebb 100644 --- a/OceanOpticsSpec/docs/OceanOpticsSpec.rst +++ b/OceanOpticsSpec/docs/OceanOpticsSpec.rst @@ -7,7 +7,7 @@ **Type**: :plugintype:`OceanOpticsSpec` **License**: :pluginlicense:`OceanOpticsSpec` **Platforms**: Windows, Linux ready but not tested -**Devices**: Ocean Optics Spectrometers remotely controlled via the Itom LibUSB Plugin. +**Devices**: Ocean Optics Spectrometers remotely controlled via the Itom LibUSB Plugin. **Author**: :pluginauthor:`OceanOpticsSpec` =============== ======================================================================================================== diff --git a/QuantumComposer/docs/QuantumComposer.rst b/QuantumComposer/docs/QuantumComposer.rst index 1c085e1f..267c00b6 100644 --- a/QuantumComposer/docs/QuantumComposer.rst +++ b/QuantumComposer/docs/QuantumComposer.rst @@ -7,7 +7,7 @@ **Type**: :plugintype:`QuantumComposer` **License**: :pluginlicense:`QuantumComposer` **Platforms**: Windows (Vista, 7, 8, 10, 11), Linux, Mac -**Devices**: Any generic USB devices controled remotely Itom LibUSB Plugin. +**Devices**: Any generic USB devices controled remotely Itom LibUSB Plugin. **Author**: :pluginauthor:`QuantumComposer` =============== ========================================================================================================