mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-20 15:08:51 +00:00
More changes to conda build
This commit is contained in:
@@ -114,6 +114,13 @@ IF(WIN32 AND ("$ENV{CONDA_BUILD}" STREQUAL ""))
|
|||||||
SET(Boost_USE_STATIC_LIBS ON)
|
SET(Boost_USE_STATIC_LIBS ON)
|
||||||
SET(Boost_USE_STATIC_RUNTIME ON)
|
SET(Boost_USE_STATIC_RUNTIME ON)
|
||||||
SET(Boost_USE_MULTITHREADED ON)
|
SET(Boost_USE_MULTITHREADED ON)
|
||||||
|
ELSE()
|
||||||
|
# Disable Boost's autolinking as the libraries to be linked to are supplied
|
||||||
|
# already by CMake, and it's going to conflict if there are multiple, as is
|
||||||
|
# the case in conda-forge's libboost feedstock.
|
||||||
|
#
|
||||||
|
# Should this always be specified?
|
||||||
|
ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
set(BOOST_COMPONENTS system program_options regex thread date_time)
|
set(BOOST_COMPONENTS system program_options regex thread date_time)
|
||||||
@@ -400,6 +407,7 @@ IF(MSVC)
|
|||||||
ENDIF()
|
ENDIF()
|
||||||
# Link against the static VC runtime
|
# Link against the static VC runtime
|
||||||
# TODO Make this configurable
|
# TODO Make this configurable
|
||||||
|
IF("$ENV{CONDA_BUILD}" STREQUAL "")
|
||||||
FOREACH(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL
|
FOREACH(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL
|
||||||
CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
|
CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
|
||||||
CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
|
CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)
|
||||||
@@ -410,6 +418,7 @@ IF(MSVC)
|
|||||||
STRING(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}")
|
STRING(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDFOREACH()
|
ENDFOREACH()
|
||||||
|
ENDIF()
|
||||||
ElSE()
|
ElSE()
|
||||||
add_definitions(-Wall -Wextra)
|
add_definitions(-Wall -Wextra)
|
||||||
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ cmake -G "NMake Makefiles" ^
|
|||||||
-DOCC_INCLUDE_DIR="%LIBRARY_PREFIX%\include\oce" ^
|
-DOCC_INCLUDE_DIR="%LIBRARY_PREFIX%\include\oce" ^
|
||||||
-DOCC_LIBRARY_DIR="%LIBRARY_PREFIX%\lib" ^
|
-DOCC_LIBRARY_DIR="%LIBRARY_PREFIX%\lib" ^
|
||||||
-DCOLLADA_SUPPORT=Off ^
|
-DCOLLADA_SUPPORT=Off ^
|
||||||
|
-DBUILD_EXAMPLES=Off ^
|
||||||
|
-DBUILD_GEOMSERVER=Off ^
|
||||||
|
-DBUILD_CONVERT=Off ^
|
||||||
../cmake
|
../cmake
|
||||||
|
|
||||||
if errorlevel 1 exit 1
|
if errorlevel 1 exit 1
|
||||||
|
|||||||
Reference in New Issue
Block a user