Install include files even in case of SWIG usage

Author: philippeVerney

src/CMakeLists.txt

@@ -258,117 +258,117 @@ if (NOT WITH_PYTHON_WRAPPING AND NOT WITH_DOTNET_WRAPPING AND NOT WITH_JAVA_WRAP
 		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	)
-
+else ()
+	# Do not install DLL import libraries (on all Windows-based systems including Cygwin; they have extension .lib, in contrast to the .dll libraries that go to RUNTIME)
 	INSTALL (
+		TARGETS ${CPP_LIBRARY_NAME}
 		EXPORT FESAPI_TARGETS
-		FILE FesapiCppTargets.cmake
-		DESTINATION
-			"${CMAKE_INSTALL_LIBDIR}/cmake/${CPP_LIBRARY_NAME}"
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	)
+endif (NOT WITH_PYTHON_WRAPPING AND NOT WITH_DOTNET_WRAPPING AND NOT WITH_JAVA_WRAPPING)
 
-	CONFIGURE_FILE(${FESAPI_ROOT_DIR}/cmake/FesapiCppConfig.cmake.in ${FESAPI_BINARY_DIR}/cmake/FesapiCppConfig.cmake @ONLY)
-	INSTALL(
-	  FILES
-		"${FESAPI_BINARY_DIR}/cmake/FesapiCppConfig.cmake"
-	  DESTINATION
+INSTALL (
+	EXPORT FESAPI_TARGETS
+	FILE FesapiCppTargets.cmake
+	DESTINATION
 		"${CMAKE_INSTALL_LIBDIR}/cmake/${CPP_LIBRARY_NAME}"
-	  )
-  
-	# namespaces
-	INSTALL (
-		FILES ${FESAPI_ROOT_DIR}/src/nsDefinitions.h ${FESAPI_ROOT_DIR}/src/version_config.h ${FESAPI_ROOT_DIR}/src/MacroDefinitions.h
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/
-		COMPONENT fesapi_headers
-	)
+)
 
-	# proxies headers
-	INSTALL (
-		FILES ${FESAPI_PROXIES_HEADERS}
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/proxies/
-		COMPONENT fesapi_headers
-	)
+CONFIGURE_FILE(${FESAPI_ROOT_DIR}/cmake/FesapiCppConfig.cmake.in ${FESAPI_BINARY_DIR}/cmake/FesapiCppConfig.cmake @ONLY)
+INSTALL(
+  FILES
+	"${FESAPI_BINARY_DIR}/cmake/FesapiCppConfig.cmake"
+  DESTINATION
+	"${CMAKE_INSTALL_LIBDIR}/cmake/${CPP_LIBRARY_NAME}"
+  )
 
-	# common headers
-	INSTALL (
-		FILES ${FESAPI_COMMON_HEADERS}
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/common
-		COMPONENT fesapi_headers
-	)
+# namespaces
+INSTALL (
+	FILES ${FESAPI_ROOT_DIR}/src/nsDefinitions.h ${FESAPI_ROOT_DIR}/src/version_config.h ${FESAPI_ROOT_DIR}/src/MacroDefinitions.h
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/
+	COMPONENT fesapi_headers
+)
 
-	# EPC headers
-	INSTALL (
-		FILES ${FESAPI_EPC_HEADERS}
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/epc/
-		COMPONENT fesapi_headers
-	)
+# proxies headers
+INSTALL (
+	FILES ${FESAPI_PROXIES_HEADERS}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/proxies/
+	COMPONENT fesapi_headers
+)
 
-	# RESQML headers
-	INSTALL (
-		FILES ${FESAPI_RESQML_2_HEADERS}
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${RESQML_PREFIX_2}/
-		COMPONENT fesapi_headers
-	)
+# common headers
+INSTALL (
+	FILES ${FESAPI_COMMON_HEADERS}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/common
+	COMPONENT fesapi_headers
+)
 
-	INSTALL (
-		FILES ${FESAPI_RESQML_2_0_1_HEADERS}
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${RESQML_PREFIX_2_0_1}/
-		COMPONENT fesapi_headers
-	)
+# EPC headers
+INSTALL (
+	FILES ${FESAPI_EPC_HEADERS}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/epc/
+	COMPONENT fesapi_headers
+)
 
-	if (WITH_RESQML2_2)
-		INSTALL (
-			FILES ${FESAPI_RESQML_2_2_HEADERS}
-			DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${RESQML_PREFIX_2_2}/
-			COMPONENT fesapi_headers
-		)
-	endif (WITH_RESQML2_2)
+# RESQML headers
+INSTALL (
+	FILES ${FESAPI_RESQML_2_HEADERS}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${RESQML_PREFIX_2}/
+	COMPONENT fesapi_headers
+)
 
+INSTALL (
+	FILES ${FESAPI_RESQML_2_0_1_HEADERS}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${RESQML_PREFIX_2_0_1}/
+	COMPONENT fesapi_headers
+)
+
+if (WITH_RESQML2_2)
 	INSTALL (
-		FILES ${FESAPI_EML_2_3_HEADERS}
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${EML_PREFIX_2_3}/
+		FILES ${FESAPI_RESQML_2_2_HEADERS}
+		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${RESQML_PREFIX_2_2}/
 		COMPONENT fesapi_headers
 	)
+endif (WITH_RESQML2_2)
 
-	# WITSML headers
-	INSTALL (
-		FILES ${FESAPI_WITSML_2_HEADERS}
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${WITSML_PREFIX_2}/
-	)
+INSTALL (
+	FILES ${FESAPI_EML_2_3_HEADERS}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${EML_PREFIX_2_3}/
+	COMPONENT fesapi_headers
+)
 
-	INSTALL (
-		FILES ${FESAPI_WITSML_2_1_HEADERS}
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${WITSML_PREFIX_2_1}/
-		COMPONENT fesapi_headers
-	)
+# WITSML headers
+INSTALL (
+	FILES ${FESAPI_WITSML_2_HEADERS}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${WITSML_PREFIX_2}/
+)
 
-	# PRODML headers
-	INSTALL (
-		FILES ${FESAPI_PRODML_2_3_HEADERS}
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${PRODML_PREFIX_2_3}/
-		COMPONENT fesapi_headers
-	)
+INSTALL (
+	FILES ${FESAPI_WITSML_2_1_HEADERS}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${WITSML_PREFIX_2_1}/
+	COMPONENT fesapi_headers
+)
 
-	# EML headers
-	INSTALL (
-		FILES ${FESAPI_EML_2_HEADERS}
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${EML_PREFIX_2}/
-		COMPONENT fesapi_headers
-	)
+# PRODML headers
+INSTALL (
+	FILES ${FESAPI_PRODML_2_3_HEADERS}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${PRODML_PREFIX_2_3}/
+	COMPONENT fesapi_headers
+)
 
-	INSTALL (
-		FILES ${FESAPI_EML_2_0_HEADERS}
-		DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${EML_PREFIX_2_0}/
-		COMPONENT fesapi_headers
-	)
-else ()
-	# Do not install DLL import libraries (on all Windows-based systems including Cygwin; they have extension .lib, in contrast to the .dll libraries that go to RUNTIME)
-	INSTALL (
-		TARGETS ${CPP_LIBRARY_NAME}
-		EXPORT FESAPI_TARGETS
-		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-	)
-endif (NOT WITH_PYTHON_WRAPPING AND NOT WITH_DOTNET_WRAPPING AND NOT WITH_JAVA_WRAPPING)
+# EML headers
+INSTALL (
+	FILES ${FESAPI_EML_2_HEADERS}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${EML_PREFIX_2}/
+	COMPONENT fesapi_headers
+)
+
+INSTALL (
+	FILES ${FESAPI_EML_2_0_HEADERS}
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fesapi/${EML_PREFIX_2_0}/
+	COMPONENT fesapi_headers
+)
 
 if (MSVC)
 	#PDB only for debug and only for shared lib waiting for https://gitlab.kitware.com/cmake/cmake/-/issues/25244 fix
@@ -383,7 +383,7 @@ endif (MSVC)
 # PropertyTypeMapping.xml
 INSTALL (
 	FILES ${FESAPI_ROOT_DIR}/resources/PropertyKindMapping.xml
-	DESTINATION ./resources/
+	DESTINATION resources/
 	COMPONENT fesapi_runtime
 )