diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 179c8e135b..2a2aff9cc7 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -159,15 +159,6 @@ endif() include(GNUInstallDirs) -# Specify paths to install files -if(NOT BINDIR) - set(BINDIR bin) -endif() -if(NOT IS_ABSOLUTE ${BINDIR}) - set(BINDIR ${CMAKE_INSTALL_BINDIR}) -endif() -message(STATUS "BINDIR: ${BINDIR}") - if(NOT INCLUDEDIR) set(INCLUDEDIR include) endif() @@ -176,16 +167,6 @@ if(NOT IS_ABSOLUTE ${INCLUDEDIR}) endif() message(STATUS "INCLUDEDIR: ${INCLUDEDIR}") -if(NOT LIBDIR) - set(LIBDIR lib) -endif() -if(NOT IS_ABSOLUTE ${LIBDIR}) - set(LIBDIR ${CMAKE_INSTALL_LIBDIR}) -endif() -message(STATUS "LIBDIR: ${LIBDIR}") - -set(IFCOPENSHELL_LIBRARY_DIR "") # for *nix rpaths - if(BUILD_SHARED_LIBS) add_definitions(-DIFC_SHARED_BUILD) if(MSVC) @@ -194,8 +175,6 @@ if(BUILD_SHARED_LIBS) # There will be couple hundreds of these so suppress them away, https://msdn.microsoft.com/en-us/library/esew7y1w.aspx add_definitions(-wd4251) endif() - - set(IFCOPENSHELL_LIBRARY_DIR "${LIBDIR}") endif() UNIFY_ENVVARS_AND_CACHE(BOOST_ROOT) @@ -765,20 +744,12 @@ if(BUILD_IFCGEOM) ) endforeach() - install(TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} ${kernel_libraries} IfcGeom - ARCHIVE DESTINATION ${LIBDIR} - LIBRARY DESTINATION ${LIBDIR} - RUNTIME DESTINATION ${BINDIR} - ) + install(TARGETS ${IFCGEOM_SCHEMA_LIBRARIES} ${kernel_libraries} IfcGeom) endif(BUILD_IFCGEOM) if(BUILD_CONVERT OR BUILD_IFCPYTHON) if(WITH_OPENCASCADE) - install(TARGETS geometry_serializer ${geometry_serializer_libraries} - ARCHIVE DESTINATION ${LIBDIR} - LIBRARY DESTINATION ${LIBDIR} - RUNTIME DESTINATION ${BINDIR} - ) + install(TARGETS geometry_serializer ${geometry_serializer_libraries}) endif() endif(BUILD_CONVERT OR BUILD_IFCPYTHON) diff --git a/src/ifcconvert/CMakeLists.txt b/src/ifcconvert/CMakeLists.txt index 60bc2fee52..4a889a57bf 100644 --- a/src/ifcconvert/CMakeLists.txt +++ b/src/ifcconvert/CMakeLists.txt @@ -14,8 +14,4 @@ if(WITH_RELATIONSHIP_VALIDATION) set_property(TARGET IfcConvert APPEND_STRING PROPERTY COMPILE_FLAGS " -DWITH_RELATIONSHIP_VALIDATION") endif() -install(TARGETS IfcConvert - ARCHIVE DESTINATION ${LIBDIR} - RUNTIME DESTINATION ${BINDIR} - LIBRARY DESTINATION ${LIBDIR} -) +install(TARGETS IfcConvert) diff --git a/src/ifcgeom/kernels/CMakeLists.txt b/src/ifcgeom/kernels/CMakeLists.txt index 729b4c9118..d7c2e12bc7 100644 --- a/src/ifcgeom/kernels/CMakeLists.txt +++ b/src/ifcgeom/kernels/CMakeLists.txt @@ -11,11 +11,7 @@ foreach(kernel ${GEOMETRY_KERNELS}) list(APPEND kernel_libraries ${KERNEL_TARGET}) target_link_libraries(${KERNEL_TARGET} ${${KERNEL_UPPER}_LIBRARIES}) - install(TARGETS ${KERNEL_TARGET} - ARCHIVE DESTINATION ${LIBDIR} - LIBRARY DESTINATION ${LIBDIR} - RUNTIME DESTINATION ${BINDIR} - ) + install(TARGETS ${KERNEL_TARGET}) if(${kernel} STREQUAL "cgal") set_property(TARGET ${KERNEL_TARGET} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCGAL_HAS_THREADS") @@ -25,11 +21,7 @@ foreach(kernel ${GEOMETRY_KERNELS}) set_target_properties(${KERNEL_TARGET_SIMPLE} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIFOPSH_SIMPLE_KERNEL -DCGAL_HAS_THREADS") list(APPEND kernel_libraries ${KERNEL_TARGET_SIMPLE}) target_link_libraries(${KERNEL_TARGET_SIMPLE} ${${KERNEL_UPPER}_LIBRARIES} Eigen3::Eigen) - install(TARGETS ${KERNEL_TARGET_SIMPLE} - ARCHIVE DESTINATION ${LIBDIR} - LIBRARY DESTINATION ${LIBDIR} - RUNTIME DESTINATION ${BINDIR} - ) + install(TARGETS ${KERNEL_TARGET_SIMPLE}) elseif(${kernel} STREQUAL "opencascade") target_link_libraries(${KERNEL_TARGET} ${OpenCASCADE_LIBRARIES}) endif() diff --git a/src/ifcgeomserver/CMakeLists.txt b/src/ifcgeomserver/CMakeLists.txt index c0b232c277..ff56607ff2 100644 --- a/src/ifcgeomserver/CMakeLists.txt +++ b/src/ifcgeomserver/CMakeLists.txt @@ -5,8 +5,4 @@ set(SOURCE_FILES ${CPP_FILES}) add_executable(IfcGeomServer ${SOURCE_FILES}) target_link_libraries(IfcGeomServer IfcGeom ${kernel_libraries} ${OpenCASCADE_LIBRARIES}) -install(TARGETS IfcGeomServer - ARCHIVE DESTINATION ${LIBDIR} - LIBRARY DESTINATION ${LIBDIR} - RUNTIME DESTINATION ${BINDIR} -) +install(TARGETS IfcGeomServer) diff --git a/src/ifcmax/CMakeLists.txt b/src/ifcmax/CMakeLists.txt index 38e83e8cb2..d306758b67 100644 --- a/src/ifcmax/CMakeLists.txt +++ b/src/ifcmax/CMakeLists.txt @@ -79,11 +79,7 @@ if(HAS_MAX) set_target_properties(IfcMax_${max_year} PROPERTIES SUFFIX ".dli") - install(TARGETS IfcMax_${max_year} - ARCHIVE DESTINATION ${LIBDIR} - LIBRARY DESTINATION ${LIBDIR} - RUNTIME DESTINATION ${BINDIR} - ) + install(TARGETS IfcMax_${max_year}) endforeach() else() message(STATUS "Autodesk 3ds Max SDK not found, is required to build IFCMax.") diff --git a/src/ifcparse/CMakeLists.txt b/src/ifcparse/CMakeLists.txt index 5714c754de..aa21cd524a 100644 --- a/src/ifcparse/CMakeLists.txt +++ b/src/ifcparse/CMakeLists.txt @@ -57,8 +57,4 @@ install(FILES ${IFCPARSE_H_FILES} DESTINATION ${INCLUDEDIR}/ifcparse ) -install(TARGETS IfcParse - ARCHIVE DESTINATION ${LIBDIR} - LIBRARY DESTINATION ${LIBDIR} - RUNTIME DESTINATION ${BINDIR} -) +install(TARGETS IfcParse) diff --git a/src/serializers/CMakeLists.txt b/src/serializers/CMakeLists.txt index 56cbfc7c32..65ebc13169 100644 --- a/src/serializers/CMakeLists.txt +++ b/src/serializers/CMakeLists.txt @@ -19,11 +19,7 @@ endif() target_link_libraries(Serializers PRIVATE ${SERIALIZER_SCHEMA_LIBRARIES} ${OPENCOLLADA_LIBRARIES} ${USD_LIBRARIES} IfcGeom ${OPENCASCADE_LIBRARIES} ${kernel_libraries} IfcParse) -install(TARGETS Serializers - ARCHIVE DESTINATION ${LIBDIR} - RUNTIME DESTINATION ${BINDIR} - LIBRARY DESTINATION ${LIBDIR} -) +install(TARGETS Serializers) install(FILES ${SERIALIZERS_H_FILES} DESTINATION ${INCLUDEDIR}/serializers/ diff --git a/src/serializers/schema_dependent/CMakeLists.txt b/src/serializers/schema_dependent/CMakeLists.txt index 40f17d283d..deb9bc23c3 100644 --- a/src/serializers/schema_dependent/CMakeLists.txt +++ b/src/serializers/schema_dependent/CMakeLists.txt @@ -12,11 +12,7 @@ foreach(schema ${SCHEMA_VERSIONS}) target_link_libraries(Serializers_ifc${schema} IfcGeom ${OPENCASCADE_LIBRARIES} ${HDF5_LIBRARIES}) endif() - install(TARGETS Serializers_ifc${schema} - ARCHIVE DESTINATION ${LIBDIR} - RUNTIME DESTINATION ${BINDIR} - LIBRARY DESTINATION ${LIBDIR} - ) + install(TARGETS Serializers_ifc${schema}) endforeach()