prepared vcpkg based build

CMakeLists.txt

@@ -17,7 +17,8 @@ find_package(OpenCASCADE COMPONENTS Visualization REQUIRED)
 include_directories(${OpenCASCADE_INCLUDE_DIR})
 MESSAGE("OCC-Include-Dir: ${OpenCASCADE_INCLUDE_DIR}")
 link_directories(${OpenCASCADE_LIBRARY_DIR})
-MESSAGE("OCC-Lib-Dir-Dir: ${OpenCASCADE_LIBRARY_DIR}")
+MESSAGE("OCC-Lib-Dir: ${OpenCASCADE_LIBRARY_DIR}")
+MESSAGE("OCC-Libs: ${OpenCASCADE_LIBRARIES}")
 
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
@@ -45,7 +46,7 @@ IF(UNIX AND NOT APPLE)
 #    link_directories(${FREETYPE_LIBRARY_DIR})
 ENDIF()
 
-set(CMAKE_CXX_STANDARD 11) # C++11...
+set(CMAKE_CXX_STANDARD 20) # C++11...
 set(CMAKE_CXX_STANDARD_REQUIRED ON) #...is required...
 set(CMAKE_CXX_EXTENSIONS OFF) #...without compiler extensions like gnu++11
 

build.ps1

@@ -0,0 +1,3 @@
+# build configured project
+
+cmake --build build --config Release -j 8

cmake/CreateExecutable.cmake

@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
 function(CreateExecutable EXECUTABLESOURCE)
 
 	get_filename_component(EXECUTABLEBINARY ${EXECUTABLESOURCE} NAME_WE)

cmake/CreateLibrary.cmake

@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
 macro(CreateLibrary)
 
 	FILE(GLOB HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/inc/*.hpp")

configure.ps1

@@ -0,0 +1,8 @@
+
+# configure VCPKG location
+$env:VCPKG_ROOT="\dev\vcpkg\"
+
+# configure triplet
+$env:VCPKG_TRIPLET="x64-windows-static"
+
+cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE="${env:VCPKG_ROOT}\scripts\buildsystems\vcpkg.cmake" -DVCPKG_TARGET_TRIPLET="${env:VCPKG_TRIPLET}"

src/CMakeLists.txt

@@ -6,54 +6,56 @@ CreateExecutable(occ-csg.cpp
 
 #${OpenCASCADE_LIBRARIES}
 
-TKSTL       # stl file support
+# TKSTL       # stl file support
 
 # order of the library might matter for static linking
 # remember to put base libs such as kernel and math at the end
 
-TKXDESTEP
-TKBinXCAF
-TKXmlXCAF
-TKXDEIGES
-TKXCAF
-TKIGES
-TKSTEP
-TKSTEP209
-TKSTEPAttr
-TKSTEPBase
-TKXSBase 
-TKStd 
-TKStdL
-TKXml 
-TKBin 
-TKXmlL 
-TKBinL 
-TKCAF 
-TKXCAF 
-TKLCAF 
-TKCDF 
-TKMeshVS 
-TKOpenGl 
-TKV3d
-TKService
-TKXMesh 
-TKMesh 
-TKOffset 
-TKFeat
-TKFillet 
-TKHLR 
-TKBool
-TKBO
-TKShHealing
-TKPrim
-TKTopAlgo
-TKGeomAlgo
-TKBRep
-TKGeomBase
-TKG3d
-TKG2d
-TKMath
-TKernel
+# TKXDESTEP
+# TKBinXCAF
+# TKXmlXCAF
+# TKXDEIGES
+# TKXCAF
+# TKIGES
+# TKSTEP
+# TKSTEP209
+# TKSTEPAttr
+# TKSTEPBase
+# TKXSBase 
+# TKStd 
+# TKStdL
+# TKXml 
+# TKBin 
+# TKXmlL 
+# TKBinL 
+# TKCAF 
+# TKXCAF 
+# TKLCAF 
+# TKCDF 
+# TKMeshVS 
+# TKOpenGl 
+# TKV3d
+# TKService
+# TKXMesh 
+# TKMesh 
+# TKOffset 
+# TKFeat
+# TKFillet 
+# TKHLR 
+# TKBool
+# TKBO
+# TKShHealing
+# TKPrim
+# TKTopAlgo
+# TKGeomAlgo
+# TKBRep
+# TKGeomBase
+# TKG3d
+# TKG2d
+# TKMath
+# TKernel
+
+${OpenCASCADE_LIBRARIES}
 
 freetype
 

src/occ-csg.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 Michael Hoffer <[email protected]>. All rights reserved.
+ * Copyright 2018-2021 Michael Hoffer <[email protected]>. All rights reserved.
  * 
  * This file is part of OCC-CSG.
  * 
@@ -132,7 +132,7 @@
 
 
 // version
-#define VERSION "0.9.9.2"
+#define VERSION "0.9.9.3"
 
 // minimal API for primitive objects
 TopoDS_Shape createBox(double x1, double y1, double z1, double x2, double y2, double z2);

test-suite/Test.java

@@ -11,7 +11,7 @@ public class Test {
 
     public static void main(String[] args) throws Exception {
 
-        checkVersion("0.9.9.2");
+        checkVersion("0.9.9.3");
         volumeObjTest("box", "-1,-1,-1,1,1,1", 0.1, 8.0, 1e-6);
         volumeObjTest("sphere", "0,0,0,1.0", 0.001, 4.189, 1e-2);
 
@@ -118,7 +118,7 @@ static Result execute(BiFunction<String, String, Boolean> eval, String... args)
             String cmdName = "../build/bin/occ-csg";
 
             if (System.getProperty("os.name").toLowerCase().contains("win")) {
-                cmdName = "../build/bin/occ-csg.exe";
+                cmdName = "../build/bin/Release/occ-csg.exe";
             }
 
             String[] cmd = Stream.concat(Arrays.stream(new String[] { cmdName }), Arrays.stream(args))

vcpkg.json

@@ -0,0 +1,14 @@
+{
+    "name": "occ-csg",
+    "version-string": "0.9.9.3",
+    "dependencies": [
+      {
+        "name": "opencascade",
+        "default-features": false,
+        "features": [
+          "freeimage",
+          "tbb"
+        ]
+      }
+    ]
+}