aboutsummaryrefslogtreecommitdiff
path: root/ports/ode
diff options
context:
space:
mode:
authorVictor Romero <romerosanchezv@gmail.com>2019-05-02 22:57:43 -0700
committerGitHub <noreply@github.com>2019-05-02 22:57:43 -0700
commit050e71d01dc9e65e6cdf1d13534fc14889e4ae38 (patch)
tree7e39943693b8ac392f37d43a03c66815c6048963 /ports/ode
parentb72f36e8cdd96ec482785e33f72f99cceebda8ad (diff)
downloadvcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.tar.gz
vcpkg-050e71d01dc9e65e6cdf1d13534fc14889e4ae38.zip
Remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS (#5937)
* [various ports] remove references to CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * [alac,benchmark,capnproto] Fix check_linkage call * [fastlz] Fix SHA512 * [coroutine] Fix dynamic build * [folly] Find double-conversion * [gamma] Use vcpkg_from_github * [librsync] Enable static builds * [netcdf-cxx4] Fix SHA512 * [octomap] Fix static build * [tidy-html5] Fix static build * [various ports] remove custom messages for shared/static builds, modernize some scripts in the meantime * [folly] Use ras0219's fix for link paths * [octomap] Fix exported targets * [uvatlas] Set tool download SHA512 * [duktape+python2] fix portfile to call configure with correct python version, manage python2 also outside win32 * [suitesparse] osx fix * [gtkmm] Call vcpkg_check_linkage after including vcpkg functions * [duktape] Resolve conflicts * [duktape] FIxed typo in Python paths * [wangle] Find zlib * [openssl-uwp] Fix SHA512 * [glib] Allow static builds on non-Windows * [suitesparse] Fix build on Windows * [multiple ports] Bump CONTROL version * [multiple ports] Fix description indent * [directxtk] Fix CONTROL file * [bde,duktape,qpid-proton] Build packages with python2 installed * [binn] remove CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS * [gdal,live555,uriparser] Fix regressions * [live555] Update to 2019.04.24
Diffstat (limited to 'ports/ode')
-rw-r--r--ports/ode/CONTROL6
-rw-r--r--ports/ode/portfile.cmake24
2 files changed, 15 insertions, 15 deletions
diff --git a/ports/ode/CONTROL b/ports/ode/CONTROL
index 952e85629..6f88319e6 100644
--- a/ports/ode/CONTROL
+++ b/ports/ode/CONTROL
@@ -1,3 +1,3 @@
-Source: ode
-Version: 0.15.1
-Description: Open Dynamics Engine
+Source: ode
+Version: 0.15.1-1
+Description: Open Dynamics Engine
diff --git a/ports/ode/portfile.cmake b/ports/ode/portfile.cmake
index 2bd55e060..a1f617fe3 100644
--- a/ports/ode/portfile.cmake
+++ b/ports/ode/portfile.cmake
@@ -36,23 +36,23 @@ else ()
set(MSBUILD_PLATFORM ${TRIPLET_SYSTEM_ARCH})
endif()
-# The build system of ode outputs its artifacts in this subdirectory
-# of the source directory
+# The build system of ode outputs its artifacts in this subdirectory
+# of the source directory
set(DEBUG_ARTIFACTS_PATH ${SOURCE_PATH}/lib/Debug)
set(RELEASE_ARTIFACTS_PATH ${SOURCE_PATH}/lib/Release)
-# To avoid contamination from previous build, we clean the directory
+# To avoid contamination from previous build, we clean the directory
file(REMOVE_RECURSE ${DEBUG_ARTIFACTS_PATH} ${RELEASE_ARTIFACTS_PATH})
-# Configure the project using the embedded premake4
+# Configure the project using the embedded premake4
message(STATUS "Configuring ${TARGET_TRIPLET}")
-# Consistently with the debian package we only ship ODE built with double precision
+# Consistently with the debian package we only ship ODE built with double precision
set(premake_OPTIONS "--only-double")
-# TODO: use vcpkg's libccd
+# TODO: use vcpkg's libccd
list(APPEND premake_OPTIONS --with-libccd)
-if(DEFINED VCPKG_LIBRARY_LINKAGE AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
list(APPEND premake_OPTIONS --only-shared)
-elseif(DEFINED VCPKG_LIBRARY_LINKAGE AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
+elseif(VCPKG_LIBRARY_LINKAGE STREQUAL static)
list(APPEND premake_OPTIONS --only-static)
endif()
if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL static)
@@ -75,11 +75,11 @@ vcpkg_build_msbuild(PROJECT_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/ode
PLATFORM ${MSBUILD_PLATFORM}
WORKING_DIRECTORY ${SOURCE_PATH}/build)
-# Install headers
+# Install headers
file(GLOB HEADER_FILES ${SOURCE_PATH}/include/ode/*.h)
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ode)
-
-# Install libraries
+
+# Install libraries
file(GLOB LIB_DEBUG_FILES ${DEBUG_ARTIFACTS_PATH}/*.lib ${DEBUG_ARTIFACTS_PATH}/*.exp)
file(INSTALL ${LIB_DEBUG_FILES}
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
@@ -89,7 +89,7 @@ if (DEFINED VCPKG_LIBRARY_LINKAGE AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file(INSTALL ${BIN_DEBUG_FILES}
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
endif ()
-
+
file(GLOB LIB_RELEASE_FILES ${RELEASE_ARTIFACTS_PATH}/*.lib ${RELEASE_ARTIFACTS_PATH}/*.exp)
file(INSTALL ${LIB_RELEASE_FILES}
DESTINATION ${CURRENT_PACKAGES_DIR}/lib)