Skip to content

MacOSX 10.10+ CoinOR stdlib patch #13

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

Merged
timosachsenberg merged 8 commits into from
Dec 11, 2015
Merged

MacOSX 10.10+ CoinOR stdlib patch #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ffdc5ad
Update coinor.cmake
jpfeuffer Dec 10, 2015
174f3e6
Update coinor.cmake
jpfeuffer Dec 11, 2015
d2198bf
Create CoinTypes.hpp.diff
jpfeuffer Dec 11, 2015
f347746
Update coinor.cmake
jpfeuffer Dec 11, 2015
bee9794
Update coinor.cmake
jpfeuffer Dec 11, 2015
da3bc63
Update CoinTypes.hpp.diff
jpfeuffer Dec 11, 2015
421bd79
Update CoinTypes.hpp.diff
jpfeuffer Dec 11, 2015
f37b584
Reverting some changes in coinor cmake script.
jpfeuffer Dec 11, 2015
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
8 changes: 6 additions & 2 deletions libraries.cmake/coinor.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,12 @@ MACRO( OPENMS_CONTRIB_BUILD_COINOR)

else() ## LINUX & Mac
set(PATCH_FILE "${PROJECT_SOURCE_DIR}/patches/coinor/CbcEventHandler.hpp.diff")
set(PATCHED_FILE "${COINOR_DIR}/Cbc/src/CbcEventHandler.hpp")
OPENMS_PATCH( PATCH_FILE COINOR_DIR PATCHED_FILE)
set(PATCHED_FILE "${COINOR_DIR}/Cbc/src/CbcEventHandler.hpp")
OPENMS_PATCH( PATCH_FILE COINOR_DIR PATCHED_FILE)

set(PATCH_FILE "${PROJECT_SOURCE_DIR}/patches/coinor/CoinTypes.hpp.diff")
set(PATCHED_FILE "${COINOR_DIR}/CoinUtils/src/CoinTypes.hpp")
OPENMS_PATCH( PATCH_FILE COINOR_DIR PATCHED_FILE)

# configure --
if( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
Expand Down
15 changes: 15 additions & 0 deletions patches/coinor/CoinTypes.hpp.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--- CoinUtils/src/CoinTypes.hpp
+++ CoinUtils/src/CoinTypes.hpp
@@ -7,7 +7,11 @@
#include "CoinUtilsConfig.h"

#ifdef HAVE_CINTTYPES
-# include <cinttypes>
+# ifdef _LIBCPP_VERSION
+# include <cinttypes>
+# else
+# include <tr1/cinttypes>
+# endif
#else
# ifdef HAVE_INTTYPES_H
# include <inttypes.h>