diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2017-01-08 01:58:53 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2017-01-08 02:01:54 (GMT) |
| commit | 4ba82ea5df1ff3a96e5e70d9a530deebbf7a6ec0 (patch) | |
| tree | a858c28fafbd744628519dcc2105bd5abe390609 /src | |
| parent | c5864def0281b684d526b556d6d3e65de6a96f1b (diff) | |
| download | mxe-4ba82ea5df1ff3a96e5e70d9a530deebbf7a6ec0.zip mxe-4ba82ea5df1ff3a96e5e70d9a530deebbf7a6ec0.tar.gz mxe-4ba82ea5df1ff3a96e5e70d9a530deebbf7a6ec0.tar.bz2 | |
cmake: force some variables in toolchain file
See https://github.com/mxe/mxe/pull/1621#issuecomment-270176619
Diffstat (limited to 'src')
| -rw-r--r-- | src/mxe-conf.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index b0f06e3..96dbd88 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -26,10 +26,10 @@ define $(PKG)_BUILD touch '$(CMAKE_TOOLCHAIN_DIR)/.gitkeep' (echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ echo 'set(MSYS 1)'; \ - echo 'set(BUILD_SHARED_LIBS $(CMAKE_SHARED_BOOL))'; \ - echo 'set(BUILD_STATIC_LIBS $(CMAKE_STATIC_BOOL))'; \ - echo 'set(BUILD_SHARED $(CMAKE_SHARED_BOOL))'; \ - echo 'set(BUILD_STATIC $(CMAKE_STATIC_BOOL))'; \ + echo 'set(BUILD_SHARED_LIBS $(CMAKE_SHARED_BOOL) CACHE BOOL "BUILD_SHARED_LIBS" FORCE)'; \ + echo 'set(BUILD_STATIC_LIBS $(CMAKE_STATIC_BOOL) CACHE BOOL "BUILD_STATIC_LIBS" FORCE)'; \ + echo 'set(BUILD_SHARED $(CMAKE_SHARED_BOOL) CACHE BOOL "BUILD_SHARED" FORCE)'; \ + echo 'set(BUILD_STATIC $(CMAKE_STATIC_BOOL) CACHE BOOL "BUILD_STATIC" FORCE)'; \ echo 'set(LIBTYPE $(if $(BUILD_SHARED),SHARED,STATIC))'; \ echo 'set(CMAKE_PREFIX_PATH $(PREFIX)/$(TARGET))'; \ echo 'set(CMAKE_FIND_ROOT_PATH $(PREFIX)/$(TARGET))'; \ @@ -42,7 +42,7 @@ define $(PKG)_BUILD echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \ echo 'set(CMAKE_MODULE_PATH "$(PREFIX)/share/cmake/modules" $${CMAKE_MODULE_PATH}) # For mxe FindPackage scripts'; \ echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ - echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")'; \ + echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel" FORCE)'; \ echo 'set(CMAKE_CROSS_COMPILING ON) # Workaround for http://www.cmake.org/Bug/view.php?id=14075'; \ echo ''; \ echo 'file(GLOB mxe_cmake_files'; \ |