Vcpkg: Build

Iswenzz · Sep 16, 2023 · 33a5fc9 · 33a5fc9
1 parent 95a1179
commit 33a5fc9
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 96 deletions.
diff --git a/.vcpkg/linux.cmake b/.vcpkg/linux.cmake
@@ -0,0 +1,3 @@
+file(TO_CMAKE_PATH $ENV{VCPKG_ROOT} VCPKG_ROOT)
+set(VCPKG_TARGET_TRIPLET x64-linux)
+include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
diff --git a/.vcpkg/osx.cmake b/.vcpkg/osx.cmake
@@ -0,0 +1,3 @@
+file(TO_CMAKE_PATH $ENV{VCPKG_ROOT} VCPKG_ROOT)
+set(VCPKG_TARGET_TRIPLET x64-osx)
+include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
diff --git a/.vcpkg/windows.cmake b/.vcpkg/windows.cmake
@@ -0,0 +1,3 @@
+file(TO_CMAKE_PATH $ENV{VCPKG_ROOT} VCPKG_ROOT)
+set(VCPKG_TARGET_TRIPLET x64-windows-static)
+include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,9 @@ add_definitions(-D_HAS_AUTO_PTR_ETC)
 if(APPLE)
    set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
 endif()
+if(WIN32)
+	add_definitions(-DWINDOWS -DNOMINMAX)
+endif()
 
 option(BUILD_EXAMPLE_PLUGINS "Build example plugins" OFF)
 option(OFX_SUPPORTS_OPENGLRENDER "Build with support for GPU rendering (OpenGL/CUDA/Metal/OpenCL)" ON)
@@ -20,8 +23,8 @@ endif()
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_BINARY_DIR} )
 
 # Conan packages
-find_package(EXPAT)
-find_package(opengl_system)
+find_package(expat CONFIG REQUIRED)
+find_package(OpenGL REQUIRED)
 
 # Macros
 set(OFX_SUPPORT_SYMBOLS_DIR ${PROJECT_SOURCE_DIR}/symbols)

diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
@@ -17,9 +17,9 @@ foreach(PLUGIN IN LISTS PLUGINS)
         set(TGT example-${PLUGIN})
 	add_ofx_plugin(${TGT} ${PLUGIN})
 	target_sources(${TGT} PUBLIC ${PLUGIN_SOURCES})
-	target_link_libraries(${TGT} ${CONAN_LIBS})
+	target_link_libraries(${TGT})
 	target_include_directories(${TGT} PUBLIC ${OFX_HEADER_DIR})
 endforeach()
 
-target_link_libraries(example-OpenGL PRIVATE opengl::opengl)
-target_link_libraries(example-Custom PRIVATE opengl::opengl)
+target_link_libraries(example-OpenGL PRIVATE OpenGL::GL)
+target_link_libraries(example-Custom PRIVATE OpenGL::GL)
diff --git a/Support/Plugins/CMakeLists.txt b/Support/Plugins/CMakeLists.txt
@@ -16,6 +16,6 @@ foreach(PLUGIN IN LISTS PLUGINS)
         set(TGT example-${PLUGIN}-support)
 	add_ofx_plugin(${TGT} ${PLUGIN})
 	target_sources(${TGT} PUBLIC ${PLUGIN_SOURCES})
-	target_link_libraries(${TGT} ${CONAN_LIBS} OfxSupport opengl::opengl)
+	target_link_libraries(${TGT} OfxSupport OpenGL::GL)
 	target_include_directories(${TGT} PUBLIC ${OFX_HEADER_DIR} ${OFX_SUPPORT_HEADER_DIR})
 endforeach()
diff --git a/Support/PropTester/CMakeLists.txt b/Support/PropTester/CMakeLists.txt
@@ -3,5 +3,5 @@ file(GLOB_RECURSE PLUGIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 set(TGT example-PropTester)
 add_ofx_plugin(${TGT} ${CMAKE_CURRENT_SOURCE_DIR})
 target_sources(${TGT} PUBLIC ${PLUGIN_SOURCES})
-target_link_libraries(${TGT} ${CONAN_LIBS} OfxSupport opengl::opengl)
+target_link_libraries(${TGT} OfxSupport OpenGL::GL)
 target_include_directories(${TGT} PUBLIC ${OFX_HEADER_DIR} ${OFX_SUPPORT_HEADER_DIR})
diff --git a/conanfile.py b/conanfile.py
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -0,0 +1,7 @@
+{
+	"default-registry": {
+		"kind": "git",
+		"repository": "https://github.com/microsoft/vcpkg",
+		"baseline": "4a600e9fea71bd7872080cbb716797e04d30e6d3"
+	}
+}
diff --git a/vcpkg.json b/vcpkg.json
@@ -0,0 +1,14 @@
+{
+	"name": "openfx",
+	"version": "1.4.0",
+	"description": "OpenFX image processing plug-in standard.",
+  	"homepage": "https://github.com/AcademySoftwareFoundation/openfx",
+	"dependencies": [
+		"opengl",
+		"expat"
+	],
+	"overrides": [
+        { "name": "opengl", "version-string": "2022-12-04#3" },
+        { "name": "expat", "version": "2.5.0#3" }
+    ]
+}