Revert "introduced a WITH_EXTERNAL_MACHINETYPES option that uses an e…

…xternal project or an internal one."

This reverts commit 5ee74c9.

CMakeLists.txt

@@ -13,7 +13,6 @@ cmake_print_variables(smooth3D_VERSION)
 
 
 option(BUILD_SHARED_LIBS    ON)
-option(WITH_EXTERNAL_MACHINETYPES  "links with an external machine_types project"  ON)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/smooth3D)
 

smooth3D/CMakeLists.txt

@@ -3,6 +3,8 @@
 #==============================================================================
 #project(smooth3D CXX)
 
+#add_definitions(-DDLLEXPORT)
+
 #==============================================================================
 # CODE STRUCTURE
 #==============================================================================
@@ -15,12 +17,6 @@ set(SMOOTH3D_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
 set(SMOOTH3D_HEADER_FILES
 	inc/smooth3D/smooth3d.h
         )
-if (NOT WITH_EXTERNAL_MACHINETYPES)
-    configure_file(inc/machine_types.h.in ${CMAKE_CURRENT_BINARY_DIR}/inc/machine_types.h @ONLY)
-    include_directories("${CMAKE_CURRENT_BINARY_DIR}/inc")
-    set(SMOOTH3D_MACHINETYPES_FILES
-	inc/machine_types.h)
-endif ()
 
 
 set(SMOOTH3D_SRC_FILES
@@ -61,9 +57,7 @@ set(SMOOTH3D_SRC_FILES
 #==============================================================================
 # DEPENDENCIES
 #==============================================================================
-if (WITH_EXTERNAL_MACHINETYPES)
-    find_package(MachineTypes REQUIRED)
-endif ()
+find_package(MachineTypes REQUIRED)
 
 find_package(Lima REQUIRED)
 
@@ -84,7 +78,7 @@ include ("${CMAKE_CURRENT_SOURCE_DIR}/FindMesquite.cmake")
 # LIBRARY BUILDING
 #==============================================================================
 
-add_library(smooth3D ${SMOOTH3D_HEADER_FILES} ${SMOOTH3D_MACHINETYPES_FILES} ${SMOOTH3D_SRC_FILES})
+add_library(smooth3D ${SMOOTH3D_HEADER_FILES} ${SMOOTH3D_SRC_FILES})
 
 #set_target_properties(gmds PROPERTIES PUBLIC_HEADER "${GMDS_HEADER_FILES}")
 
@@ -94,9 +88,7 @@ add_library(smooth3D ${SMOOTH3D_HEADER_FILES} ${SMOOTH3D_MACHINETYPES_FILES} ${S
 
 target_link_libraries(smooth3D PRIVATE gmds)
 target_link_libraries(smooth3D PRIVATE Lima::Lima Mesquite::Mesquite)
-if (WITH_EXTERNAL_MACHINETYPES)
-    target_link_libraries(smooth3D PUBLIC MachineTypes::MachineTypes)
-endif ()
+target_link_libraries(smooth3D PUBLIC MachineTypes::MachineTypes)
 
 #add_custom_command(
 #   TARGET gmds
@@ -117,11 +109,6 @@ install(TARGETS smooth3D
 
 install(FILES
         ${SMOOTH3D_HEADER_FILES} DESTINATION include/smooth3D)
-if (NOT WITH_EXTERNAL_MACHINETYPES)
-install(FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/inc/machine_types.h DESTINATION include/)
-endif ()
-
 
 
 set(INCLUDE_INSTALL_DIR include/ )