Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gasol] Add new port #9550

Merged
merged 9 commits into from
May 7, 2020
Merged

[gasol] Add new port #9550

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c58efec
Added new port GASol
mayankkt9 Jan 4, 2020
bae3df9
added patch file
SanaJahan Jan 4, 2020
94f7ccf
Code Refactoring
mayankkt9 Jan 4, 2020
509e261
Code Refactoring to change port name
mayankkt9 Jan 4, 2020
9e296de
Updated baseline to resolve file conflicts with nanovg and stb
mayankkt9 Jan 6, 2020
cb83783
Added changes to ci-baseline and added port not supported on arm/uwp
mayankkt9 Jan 19, 2020
1ee8b24
Merge branch 'master' of https://github.com/microsoft/vcpkg into issu…
Apr 15, 2020
328166f
[gasol] Use cmake to build
Apr 15, 2020
27b50f6
update baseline
May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ports/gasol/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Source: gasol
Version: 2018-01-04
Homepage: https://github.com/PytLab/GASol
Description: A general Genetic Algorithm Solver in C++
19 changes: 19 additions & 0 deletions ports/gasol/fix-install.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cba691..51e47a3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,13 @@
file(GLOB GASol_SRC *.cpp)
add_library(GASol STATIC ${GASol_SRC})

+file(GLOB GASol_INCLUDES *.h)
+
+install(FILES ${GASol_INCLUDES} DESTINATION include)
+
+install(
+ TARGETS GASol
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+)
\ No newline at end of file
31 changes: 31 additions & 0 deletions ports/gasol/gasol.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a21f65..a4cede0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,11 +15,15 @@ set(CMAKE_CXX_EXTENSIONS OFF)
# Find OpenMP.
find_package(OpenMP)
if (OPENMP_FOUND)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -fPIC -Wall -Wextra -Werror -pedantic")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} -fPIC -pedantic")
else()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -Wextra -Werror -pedantic")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pedantic")
endif()

+if(CMAKE_COMPILER_IS_GNUCXX)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
+endif(CMAKE_COMPILER_IS_GNUCXX)
+
if (COV)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
endif()
@@ -39,7 +43,7 @@ endif()
add_subdirectory(src)

# GASol test dir.
-add_subdirectory(unittest)
+# add_subdirectory(unittest)

# GASol run dir.
add_subdirectory(example)
25 changes: 25 additions & 0 deletions ports/gasol/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm" "arm64")

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO PytLab/GASol
REF 05af009bca2903c1cc491c9a6eed01bc3c936637
SHA512 a8546bf565a389b919dd1dd5b88b4985c1803cbb09fab0715d1b0abfda92a6bf3adea7e4b3329ad82a6f6892f1747a73a632687fd79fb77c937e7ba07c62268a
HEAD_REF master
PATCHES
gasol.patch
fix-install.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)

vcpkg_install_cmake()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
5 changes: 5 additions & 0 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,9 @@ gainput:x64-uwp=fail
gainput:x64-windows-static=fail
gamma:x64-linux=fail
gamma:x64-osx=fail
gasol:arm64-windows=fail
gasol:arm-uwp=fail
gasol:x64-uwp=fail
gdcm:arm64-windows=fail
gdcm:x64-linux = skip
geographiclib:x64-linux=ignore
Expand Down Expand Up @@ -1678,6 +1681,8 @@ speexdsp:x64-linux=fail
speexdsp:x64-osx=fail
spirv-tools:arm-uwp=fail
spirv-tools:x64-uwp=fail
# conflicts with nanovg
stb:x86-windows=ignore
stormlib:arm-uwp=fail
stormlib:x64-uwp=fail
stxxl:arm-uwp=fail
Expand Down