diff --git a/ports/rappture/CMakeLists.txt b/ports/rappture/CMakeLists.txt index 57d7739258..1ddaaa781b 100644 --- a/ports/rappture/CMakeLists.txt +++ b/ports/rappture/CMakeLists.txt @@ -80,23 +80,25 @@ set(HEADERS add_library(rappture ${SRC_RAPPTURE_CORE} ${HEADERS}) -target_include_directories(rappture PUBLIC - $ +set_property(TARGET rappture PROPERTY CXX_STANDARD 11) + +target_include_directories(rappture PUBLIC + $ $ ) find_package(expat CONFIG REQUIRED) find_package(ZLIB REQUIRED) -target_compile_definitions(rappture PUBLIC - -D_CRT_SECURE_NO_WARNINGS - -DRAPPTURE_VERSION=1.9 - -DSVN_VERSION=6713 +target_compile_definitions(rappture PUBLIC + -D_CRT_SECURE_NO_WARNINGS + -DRAPPTURE_VERSION=1.9 + -DSVN_VERSION=6713 -D_USE_MATH_DEFINES ) -target_link_libraries(rappture PRIVATE - expat::expat +target_link_libraries(rappture PRIVATE + expat::expat ZLIB::ZLIB ) diff --git a/ports/rappture/vcpkg.json b/ports/rappture/vcpkg.json index 68a1a5efa9..65e4caed60 100644 --- a/ports/rappture/vcpkg.json +++ b/ports/rappture/vcpkg.json @@ -1,8 +1,9 @@ { "name": "rappture", "version": "1.9", - "port-version": 1, + "port-version": 2, "description": "Rappture is a toolkit supporting Rapid application infrastructure, making it quick and easy to develop powerful scientific applications.", + "license": null, "dependencies": [ "expat", { diff --git a/versions/baseline.json b/versions/baseline.json index a6eaa3c87e..37b62675ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6458,7 +6458,7 @@ }, "rappture": { "baseline": "1.9", - "port-version": 1 + "port-version": 2 }, "raylib": { "baseline": "4.2.0", diff --git a/versions/r-/rappture.json b/versions/r-/rappture.json index ae1cfa5a62..c1622b4382 100644 --- a/versions/r-/rappture.json +++ b/versions/r-/rappture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a477ff69e89f147d8d51545dce1eaf309401bc2", + "version": "1.9", + "port-version": 2 + }, { "git-tree": "46511874b74e433c10e518d592ae43a475bb7aaf", "version": "1.9",