backup/planetblupi-dev
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi-dev synced 2024-12-30 13:55:36 +01:00
Code Issues Projects Releases Activity

Remove the build of libiconv; use the one provided by OSX

Browse Source 
It seems a bit difficult to use our own libiconv because some base
libs are linking against the system one.
This commit is contained in:
Mathieu Schroeter 2017-07-30 00:19:18 +02:00
parent ff974bf255
commit 40388af562
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@ -43,18 +43,20 @@ endif ()
## libiconv
###########
ExternalProject_Add (libiconv_Project
URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz
PREFIX ${CMAKE_BINARY_DIR}
CONFIGURE_COMMAND ${CMD} ./configure
--prefix=${CMAKE_BINARY_DIR}
--disable-shared
--enable-static
BUILD_COMMAND ${CMD} make
INSTALL_COMMAND ${CMD} make install
BUILD_IN_SOURCE 1
INSTALL_DIR ${CMAKE_BINARY_DIR}
)
if (NOT APPLE)
ExternalProject_Add (libiconv_Project
URL https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz
PREFIX ${CMAKE_BINARY_DIR}
CONFIGURE_COMMAND ${CMD} ./configure
--prefix=${CMAKE_BINARY_DIR}
--disable-shared
--enable-static
BUILD_COMMAND ${CMD} make
INSTALL_COMMAND ${CMD} make install
BUILD_IN_SOURCE 1
INSTALL_DIR ${CMAKE_BINARY_DIR}
)
endif ()
##########
## gettext
@ -71,7 +73,7 @@ ExternalProject_Add (gettext_Project
INSTALL_COMMAND ${CMD} make -C gettext-runtime install
BUILD_IN_SOURCE 1
INSTALL_DIR ${CMAKE_BINARY_DIR}
DEPENDS libiconv_Project
# DEPENDS libiconv_Project
)
#########
@ -255,7 +257,7 @@ ExternalProject_Add (SDL2_mixer_Project
INSTALL_COMMAND ${CMD} make install
BUILD_IN_SOURCE 1
INSTALL_DIR ${CMAKE_BINARY_DIR}
DEPENDS SDL2_Project
DEPENDS SDL2_Project # libiconv_Project
)
##################