Cleaning up the CMake files from unecessary things, proper support for x86_64...

Cleaning up the CMake files from unecessary things, proper support for x86_64 (it needs to be named as "amd64" on Debian), a few extra options for the cpack generators.

CMakeLists.txt

@@ -178,16 +178,6 @@ INSTALL(FILES ${hlawsfiles} DESTINATION include/meteoio/meteoLaws COMPONENT head
 INSTALL(FILES ${hfilterfiles} DESTINATION include/meteoio/meteoFilters COMPONENT headers)
 INSTALL(FILES ${hstatsfiles} DESTINATION include/meteoio/meteoStats COMPONENT headers)
 
-IF(WIN32) #only having it in meteoio/CMake... is not enough...
-	FILE(GLOB_RECURSE importlibs "lib/libmeteo*.lib")
-	FILE(GLOB_RECURSE dlls "lib/libmeteo*.dll")
-	INSTALL(FILES ${dlls} ${importlibs} DESTINATION lib COMPONENT libraries)
-ENDIF(WIN32)
-IF(APPLE) #only having it in meteoio/CMake... is not enough...
-	FILE(GLOB_RECURSE dlls "lib/libmeteo*.dylib")
-	INSTALL(FILES ${dlls} DESTINATION lib COMPONENT libraries)
-ENDIF(APPLE)
-
 ADD_CUSTOM_TARGET(distclean make clean
 	COMMAND cmake -E remove CMakeCache.txt CPackSourceConfig.cmake CPackConfig.cmake CTestTestfile.cmake DartConfiguration.tcl cmake_install.cmake cmake_uninstall.cmake install_manifest.txt Makefile
 	COMMAND cmake -E remove "lib/libmeteo*.${DLL_EXT}" "lib/libmeteo*.${STAT_EXT}" "lib/libmeteo*.lib"
@@ -268,16 +258,12 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/License.txt")
 SET(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_SOURCE_DIR}/Welcome.txt")
 SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/Readme.txt")
 
-IF (DEST MATCHES "par")
-	SET(PACKAGE_EXTRA "-par")
-ENDIF(DEST MATCHES "par")
 SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
 SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
 SET(VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-#SET(CPACK_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
-SET(CPACK_ARCH "i386")
-SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}${PACKAGE_EXTRA}-${VERSION}-${CPACK_ARCH}")
+SET(CPACK_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
+SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${VERSION}-${CPACK_ARCH}")
 
 #installation by components for formats that support it
 #SET(CPACK_COMPONENTS_ALL_GROUPS_IN_ONE_PACKAGE 1)
@@ -310,33 +296,42 @@ IF(UNIX)
 	IF(APPLE)
 		SET(CPACK_GENERATOR "PackageMaker")
 		SET(CPACK_PACKAGING_INSTALL_PREFIX "/Applications/${CPACK_PACKAGE_NAME}")
+		SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/meteoio/icons/icon.icns")
+		SET(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/meteoio/icons/icon.icns")
+		SET_SOURCE_FILES_PROPERTIES(${CPACK_BUNDLE_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 	ELSE(APPLE)
 		SET(CPACK_GENERATOR "DEB;RPM;TGZ")
 		SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
 		SET(CPACK_DEBIAN_PACKAGE_NAME "meteoio")
 		SET(CPACK_DEBIAN_PACKAGE_SECTION "devel")
 		SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libstdc++6") #objdump -p lib/libmeteoio.so | grep NEEDED | tr -s ' ' | cut -d' ' -f3 | tr '\n' ','
-		SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386") #dpkg --print-architecture
+		#SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386") #dpkg --print-architecture
+		IF("${CPACK_ARCH}" STREQUAL "x86_64")
+			SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
+		ELSE("${CPACK_ARCH}" STREQUAL "x86_64")
+			SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${CPACK_ARCH}")
+		ENDIF("${CPACK_ARCH}" STREQUAL "x86_64")
 		SET(CPACK_RPM_PACKAGE_NAME "meteoio")
 		SET(CPACK_RPM_PACKAGE_LICENSE "LPGLv3")
 		SET(CPACK_RPM_PACKAGE_REQUIRES "libstdc++6") #simply libproj for OpenSuse
-		SET(CPACK_RPM_PACKAGE_ARCHITECTURE "i386")
+		SET(CPACK_RPM_PACKAGE_ARCHITECTURE "${CPACK_ARCH}")
 		SET(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
 	ENDIF(APPLE)
 ELSE(UNIX)
 	IF(WIN32)
 		SET(CPACK_GENERATOR "NSIS")
 		SET(CPACK_NSIS_MUI_ICON "${CPACK_PACKAGE_ICON}")
+		SET(CPACK_PACKAGE_ICON "${CPACK_PACKAGE_ICON}")
 		SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}")
 		SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAME}")
 		IF(INSTALL_DOC)
 			SET(CPACK_NSIS_MENU_LINKS
 				"${DOC_PATH}/MeteoIO_doc.html" "MeteoIO documentation"
 				"${DOC_PATH}/examples" "MeteoIO examples"
-				"https://models.slf.ch/p/meteoio/" "Home page")
+				"https://models.slf.ch/p/meteoio/" "MeteoIO Home page")
 		ELSEIF(INSTALL_DOC)
 			SET(CPACK_NSIS_MENU_LINKS
-				"https://models.slf.ch/p/meteoio/" "Home page")
+				"https://models.slf.ch/p/meteoio/" "MeteoIO Home page")
 		ENDIF(INSTALL_DOC)
 		#info for the add/uninstall software administration
 		SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_NAME}-${VERSION}")

meteoio/CMakeLists.txt

@@ -86,10 +86,9 @@ IF(BUILD_SHARED_LIBS)
 		SOVERSION "${VERSION_MAJOR}"
 	)
 	INSTALL(TARGETS ${SHAREDNAME}
-		RUNTIME DESTINATION lib
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-		COMPONENT libraries
+		RUNTIME DESTINATION lib COMPONENT libraries
+		LIBRARY DESTINATION lib COMPONENT libraries
+		ARCHIVE DESTINATION lib COMPONENT libraries
 	)
 ENDIF(BUILD_SHARED_LIBS)
 
@@ -109,15 +108,9 @@ IF(BUILD_STATIC_LIBS)
 		OUTPUT_NAME ${STATICLIBNAME}
 	)
 	INSTALL(TARGETS ${STATICNAME}
-		RUNTIME DESTINATION lib
-		LIBRARY DESTINATION lib
-		ARCHIVE DESTINATION lib
-		COMPONENT libraries
+		RUNTIME DESTINATION lib COMPONENT libraries
+		LIBRARY DESTINATION lib COMPONENT libraries
+		ARCHIVE DESTINATION lib COMPONENT libraries
 	)
 ENDIF(BUILD_STATIC_LIBS)
 
-IF(WIN32) #handle the special case of WIN32 needing import libraries
-	FILE(GLOB_RECURSE importlibs "lib/libmeteo*.lib")
-	FILE(GLOB_RECURSE dlls "lib/libmeteo*.dll") #bug: otherwise, dlls are missing
-	INSTALL(FILES ${dlls} ${importlibs} DESTINATION lib COMPONENT libraries)
-ENDIF(WIN32)

tools/cmake/FindMeteoIO.cmake

@@ -31,12 +31,9 @@ IF(WIN32)
 			)
 	ENDIF(MSVC)
 ELSE(WIN32)
-	IF(POPC)
-		SET(POPC_EXT "popc")
-	ENDIF(POPC)
 	IF(APPLE)
 		FIND_LIBRARY(METEOIO_LIBRARY
-		NAMES meteoio${POPC_EXT}
+		NAMES meteoio
 		PATHS
 			ENV LD_LIBRARY_PATH
 			ENV DYLD_FALLBACK_LIBRARY_PATH
@@ -51,7 +48,7 @@ ELSE(WIN32)
 		)
 	ELSE(APPLE)
 		FIND_LIBRARY(METEOIO_LIBRARY
-		NAMES meteoio${POPC_EXT}
+		NAMES meteoio
 		PATHS
 			ENV LD_LIBRARY_PATH
 			${SRC_DIR}/meteoio/lib