more cleanup

This commit is contained in:
Thomas Krijnen
2021-02-05 11:39:35 +01:00
parent 894bae66fd
commit c0a62e8593
8 changed files with 111 additions and 316 deletions
+1 -17
View File
@@ -23,7 +23,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) # not necessary, but encouraged
project (IfcOpenShell)
foreach(max_year RANGE 2014 2030)
set(max_sdk "$ENV{ADSK_3DSMAX_SDK_${max_year}}")
if (NOT "${max_sdk}" STREQUAL "")
@@ -106,17 +105,6 @@ MACRO(UNIFY_ENVVARS_AND_CACHE VAR)
ENDIF()
ENDMACRO()
UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR)
UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT)
UNIFY_ENVVARS_AND_CACHE(BOOST_LIBRARYDIR)
message(STATUS "BOOST_ROOT ${BOOST_ROOT}")
message(STATUS "BOOST_LIBRARYDIR ${BOOST_LIBRARYDIR}")
UNIFY_ENVVARS_AND_CACHE(OCC_INCLUDE_DIR)
UNIFY_ENVVARS_AND_CACHE(OCC_LIBRARY_DIR)
UNIFY_ENVVARS_AND_CACHE(OPENCOLLADA_INCLUDE_DIR)
@@ -221,7 +209,7 @@ function(add_debug_variants NAME LIBRARIES POSTFIX)
endfunction()
if(BUILD_IFCGEOM)
MESSAGE(STATUS "OCC_INCLUDE_DIR ${OCC_INCLUDE_DIR}")
# Find Open CASCADE
IF("${OCC_INCLUDE_DIR}" STREQUAL "")
SET(OCC_INCLUDE_DIR "/usr/include/oce/" CACHE FILEPATH "Open CASCADE header files")
@@ -404,10 +392,6 @@ if(ENABLE_BUILD_OPTIMIZATIONS)
endif()
endif()
IF(MSVC)
# Enable solution folders (free VS versions prior to 2012 don't support solution folders)
if (MSVC_VERSION GREATER 1600)