diff options
| author | Mayank Kataruka <37381526+mayankkt9@users.noreply.github.com> | 2020-05-07 12:36:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-07 12:36:44 -0700 |
| commit | 0bee296e721e9282999c60784ac80440dd157785 (patch) | |
| tree | 17e8d70b3c478af2c0db8174575852d2a514f916 | |
| parent | 164284d86be7590f0162a18f9189eded1caa5374 (diff) | |
| download | vcpkg-0bee296e721e9282999c60784ac80440dd157785.tar.gz vcpkg-0bee296e721e9282999c60784ac80440dd157785.zip | |
[gasol] Add new port (#9550)
* Added new port GASol
* added patch file
* Code Refactoring
* Code Refactoring to change port name
* Updated baseline to resolve file conflicts with nanovg and stb
* Added changes to ci-baseline and added port not supported on arm/uwp
* [gasol] Use cmake to build
* update baseline
Co-authored-by: SanaJahan <sanadgrt@gmail.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
| -rw-r--r-- | ports/gasol/CONTROL | 4 | ||||
| -rw-r--r-- | ports/gasol/fix-install.patch | 19 | ||||
| -rw-r--r-- | ports/gasol/gasol.patch | 31 | ||||
| -rw-r--r-- | ports/gasol/portfile.cmake | 25 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 5 |
5 files changed, 83 insertions, 1 deletions
diff --git a/ports/gasol/CONTROL b/ports/gasol/CONTROL new file mode 100644 index 000000000..2ae5ce2d3 --- /dev/null +++ b/ports/gasol/CONTROL @@ -0,0 +1,4 @@ +Source: gasol
+Version: 2018-01-04
+Homepage: https://github.com/PytLab/GASol
+Description: A general Genetic Algorithm Solver in C++
diff --git a/ports/gasol/fix-install.patch b/ports/gasol/fix-install.patch new file mode 100644 index 000000000..5d2be99d7 --- /dev/null +++ b/ports/gasol/fix-install.patch @@ -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 diff --git a/ports/gasol/gasol.patch b/ports/gasol/gasol.patch new file mode 100644 index 000000000..92d484e2a --- /dev/null +++ b/ports/gasol/gasol.patch @@ -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) diff --git a/ports/gasol/portfile.cmake b/ports/gasol/portfile.cmake new file mode 100644 index 000000000..5d3ed6b59 --- /dev/null +++ b/ports/gasol/portfile.cmake @@ -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) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7fcbbd9b5..2d32d0010 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -507,6 +507,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
@@ -1172,7 +1175,7 @@ nanovg:x64-uwp=fail nanovg:x64-linux=ignore
nanovg:x64-windows=ignore
nanovg:x64-windows-static=ignore
-nanovg:x86-windows=ignore
+nanovg:x86-windows=skip
nativefiledialog:arm-uwp=fail
nativefiledialog:x64-uwp=fail
netcdf-cxx4:x64-linux=ignore
|
