Adding IDX2

sci-visus · May 6, 2024 · 3d3460c · 3d3460c
1 parent e9b0f7a
commit 3d3460c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 203 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -144,17 +144,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 # must be before PROJECT command
 SET(MSVC_INCREMENTAL_DEFAULT OFF) 
 
-
-option(VISUS_MINIMAL      "Enable VISUS_MINIMAL"   OFF)
-
-
-# this must be before project
-if (VISUS_MINIMAL)
-	MESSAGE(STATUS "Forcing static linking on MSVC")
-	SET(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-endif()
-
-
 PROJECT(OpenVisus) 
 
 # todo this default for linux too
@@ -182,21 +171,6 @@ option(VISUS_HDF5         "Enable VISUS_HDF5"      OFF)
 option(VISUS_WEAVING      "Enable VISUS_WEAVING"   OFF)
 option(VISUS_IDX2         "Enable VISUS_IDX2"      ON) # 20240506 scrgiorgio: changing default to ON
 
-if (VISUS_MINIMAL)
-	SET(BUILD_SHARED_LIBS OFF CACHE BOOL "disabled" FORCE)
-	SET(VISUS_NET         OFF CACHE BOOL "disabled" FORCE)
-	SET(VISUS_IMAGE       OFF CACHE BOOL "disabled" FORCE)
-	SET(VISUS_DATAFLOW    OFF CACHE BOOL "disabled" FORCE)
-	SET(VISUS_PYTHON      OFF CACHE BOOL "disabled" FORCE)
-	SET(VISUS_GUI         OFF CACHE BOOL "disabled" FORCE)
-	SET(VISUS_MODVISUS    OFF CACHE BOOL "disabled" FORCE)
-	SET(VISUS_SLAM        OFF CACHE BOOL "disabled" FORCE)
-	SET(VISUS_OSPRAY      OFF CACHE BOOL "disabled" FORCE)
-	SET(VISUS_HDF5        OFF CACHE BOOL "disabled" FORCE)
-	SET(VISUS_WEAVING     OFF CACHE BOOL "disabled" FORCE)
-	SET(VISUS_IDX2        OFF CACHE BOOL "disabled" FORCE)
-endif()
-
 MESSAGE(STATUS "BUILD_SHARED_LIBS  ${BUILD_SHARED_LIBS}")
 MESSAGE(STATUS "VISUS_NET          ${VISUS_NET}")
 MESSAGE(STATUS "VISUS_IMAGE        ${VISUS_IMAGE}")
@@ -239,10 +213,8 @@ endif()
 
 add_subdirectory(ExternalLibs)
 add_subdirectory(Libs)
+add_subdirectory(Executable)
 
-if (NOT VISUS_MINIMAL)
-	add_subdirectory(Executable)
-endif()
 
 # ///////////////////////////////////////////////////////////////////////////
 # install step (NOTE: there is no need to install binaries/libraries since they are already in correct position)

diff --git a/Executable/hdf5_plugin/README.md b/Executable/hdf5_plugin/README.md
@@ -98,7 +98,7 @@ Run cmake and Configure/Generate/Configure/Generate as usual (**change values as
 
 -   Where the source code: `D:/hdf5`
 -   Where to build the binaries `D:/hdf5/build`
--   Compiler: `Visual Studio 16 2019`
+-   Compiler: `Visual Studio 17 2022`
 -   Platform: `x64`
 -   Change the `CMAKE_INSTALL_PREFIX` to `d:/hdf5/install`
 

diff --git a/Executable/test_static_linking/ReadMe.md b/Executable/test_static_linking/ReadMe.md
@@ -1,50 +1,4 @@
 
-# Example of producing a minimal static library 
-
-Minimal means:
-- no python
-- no FreeImage
-- no CURL network service
-- no Gui
-- just flat OpenVisus IDX (i.e. Kernel and DB)
-
-
-(OPTIONAL) Set the path to find cmake:
-
-```
-set PATH="C:\Program Files\CMake\bin";%PATH
-```
-
-Choose the configuration you want to try (DO NOT mix Debug with Release and viceversa):
-
-```
-set CONFIG=Release
-```
-
-Compile OpenVisus static library (NOTE I am compiling/installing all configurations just in case):
-
-```
-mkdir build_minimal 
-cd build_minimal
-cmake -G "Visual Studio 16 2019" -A "x64" -DVISUS_MINIMAL=1 ../ 
-cmake --build . --target ALL_BUILD --config %CONFIG%
-cmake --build . --target INSTALL   --config %CONFIG%
-set OPENVISUS_DIR=%cd%\%CONFIG%\OpenVisus
-cd ..
-```
-
-Then consume the library linking:
-
-```
-cd Executable\test_static_linking
-mkdir build
-cd build
-cmake -G "Visual Studio 16 2019" -A "x64" -DOPENVISUS_DIR=%OPENVISUS_DIR% ../
-cmake --build . --target ALL_BUILD --config %CONFIG%
-```
-
-
-
 
 
 
diff --git a/docs/compilation.md b/docs/compilation.md
@@ -37,7 +37,7 @@ git clone https://github.com/sci-visus/OpenVisus
 cd OpenVisus
 mkdir build
 cd build
-cmake -G "Visual Studio 16 2019" -A "x64" -DQt5_DIR=%Qt5_DIR% -DPython_EXECUTABLE=%Python_EXECUTABLE% ../ 
+cmake -G "Visual Studio 17 2022" -A "x64" -DQt5_DIR=%Qt5_DIR% -DPython_EXECUTABLE=%Python_EXECUTABLE% ../ 
 cmake --build . --target ALL_BUILD --config Release
 cmake --build . --target INSTALL   --config Release
 
@@ -47,38 +47,6 @@ python -m OpenVisus viewer
 ```
 
 
-<!--//////////////////////////////////////////////////////////////////////// -->
-## Windows compilation mingw
-
-
-
-Install prerequisites. The fastest way is to use `chocolatey`:
-
-```
-choco install -y git cmake mingw
-```
-
-To compile OpenVisus (change the paths as needed):
-
-```
-git clone https://github.com/sci-visus/OpenVisus
-cd OpenVisus
-
-mkdir build_gcc
-cd build_gcc
-
-set PATH=%PATH%;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin
-
-# NOTE: only VISUS_MINIMAL is supported.
-cmake -G "MinGW Makefiles" -DVISUS_MINIMAL=1 ../ 
-cmake --build . --target all       --config Release
-cmake --build . --target install   --config Release
-
-set PYTHON_PATH=.\Release
-python -m OpenVisus configure --user
-python -m OpenVisus viewer
-```
-
 
 <!--//////////////////////////////////////////////////////////////////////// -->
 ## MacOSX compilation clang
@@ -289,98 +257,6 @@ PYTHONPATH=$(pwd)/Release python3 -m OpenVisus viewer
 ```
 
 
-<!--//////////////////////////////d////////////////////////////////////////// -->
-## Minimal compilation
-
-Minimal compilation disable 
-
-- Image support
-- Network support
-- Python supports
-
-it enables only minimal IDX read/write operations.
-
-For Windows/Visual Studio:
-
-```
-mkdir build && cd build
-cmake -G "Visual Studio 16 2019" -A "x64" -DVISUS_MINIMAL=1 ../ 
-cmake --build . --target ALL_BUILD --config Release
-cmake --build . --target INSTALL   --config Release
-```
-
-For Windows/mingw
-
-```
-choco install -y mingw
-set PATH=%PATH%;C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin
-mkdir build && cd build
-cmake -G "MinGW Makefiles" -DVISUS_MINIMAL=1 ../ 
-cmake --build . --target all       --config Release
-cmake --build . --target install   --config Release
-```
-
-For Apple/Xcode
-
-```
-mkdir build  && cd build
-cmake -GXcode -DVISUS_MINIMAL=1 ../
-cmake --build ./ --target ALL_BUILD --config Release --parallel 4
-cmake --build ./ --target install   --config Release
-```
-
-For Apple/gcc:
-
-```
-
-brew install gcc
-export CC=cc-9
-export CXX=g++-9
-mkdir build && cd build
-cmake -G"Unix Makefiles" -DVISUS_MINIMAL=1 ../
-make -j 
-make install
-```
-
-
-For Linux/gcc:
-
-```
-mkdir build && cd build
-cmake -DVISUS_MINIMAL ../
-make -j
-make install
-```
-
-
-To use the VisusMinimal you can create a Makefile (change as needed):
-
-```
-CXX=g++-9 -std=c++11
-
-OpenVisus_DIR=build/Release/OpenVisus
-
-CXX_FLAGS=\
-	-I$(OpenVisus_DIR)/include/Db \
-	-I$(OpenVisus_DIR)/include/Kernel \
-	-DVISUS_STATIC_LIB=1 
-
-main: main.o
-	$(CXX) -o $@ $< -L${OpenVisus_DIR}/lib -lVisusKernel VisusDb
- 
-main.o: main.cpp 
-	$(CXX) $(CXX_FLAGS) -c -o $@ $< 
-
-clean:
-	rm -f  main main.o
-
-.PHONY: clean
-```
-
-If you don't want to use C++11 because you have an old compiler (like C++98) see Executable/use_minimal directory
-which use exclusively a `Visus/Minimal.h` header.
-
-
 <!--//////////////////////////////////////////////////////////////////////// -->
 ## Commit tag
 

diff --git a/scripts/conda.windows.sh b/scripts/conda.windows.sh
@@ -73,7 +73,7 @@ if [[ "1" == "1" ]]; then
     BUILD_DIR=build_windows_conda
     mkdir -p ${BUILD_DIR} 
     cd ${BUILD_DIR}
-    cmake -G "Visual Studio 16 2019" -A x64 \
+    cmake -G "Visual Studio 17 2022" -A x64 \
         -DQt5_DIR=${CONDA_PREFIX}/Library/lib/cmake/Qt5 \
         -DSWIG_EXECUTABLE=$(which swig) \
         -DPython_EXECUTABLE=${PYTHON} \

diff --git a/scripts/cpython.windows.sh b/scripts/cpython.windows.sh
@@ -118,7 +118,7 @@ if [[ "1" == "1" ]]; then
 	mkdir -p ${BUILD_DIR} 
 	cd ${BUILD_DIR}
 	cmake \
-		-G "Visual Studio 16 2019" \
+		-G "Visual Studio 17 2022" \
 		-A x64 \
 		-DQt5_DIR=${Qt5_Dir} \
 		-DPython_EXECUTABLE=${PYTHON} \