Merge branch 'master' into sx-init

3 files changed, 35 insertions, 32 deletions

diff --git a/ports/systemc/CONTROL b/ports/systemc/CONTROL
index 488a06338..4f1bd67d9 100644
--- a/ports/systemc/CONTROL
+++ b/ports/systemc/CONTROL
@@ -1,3 +1,3 @@
 Source: systemc

-Version: 2.3.3-2

+Version: 2.3.3-3

 Description: A set of C++ classes and macros which provide an event-driven simulation kernel in C++

diff --git a/ports/systemc/install.patch b/ports/systemc/install.patch
index d335a8b18..ef133a14f 100644
--- a/ports/systemc/install.patch
+++ b/ports/systemc/install.patch
@@ -1,23 +1,31 @@
---- CMakeLists.txt	Sat Oct 13 00:19:07 2018

-+++ CMakeLists.txt.fixed	Mon Jan 28 15:51:38 2019

-@@ -555,7 +555,7 @@

- endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

- 

- # Set the installation paths for headers, libraries, and documentation.

--set (CMAKE_INSTALL_DOCDIR "share/doc/systemc" CACHE PATH

-+set (CMAKE_INSTALL_DOCDIR "share/systemc" CACHE PATH

-      "Documentation installation directory") # otherwise mixed-case

- if (INSTALL_TO_LIB_BUILD_TYPE_DIR)

-   # Install libraries to lib-${CMAKE_BUILD_TYPE} so that different build variants

-@@ -589,9 +589,9 @@

-   set (SystemCTLM_INSTALL_CMAKEDIR share/cmake/SystemCTLM CACHE PATH

-        "CMake package configuration installation directory" FORCE)

- else (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR)

--  set (SystemCLanguage_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCLanguage CACHE PATH

-+  set (SystemCLanguage_INSTALL_CMAKEDIR share/SystemCLanguage CACHE PATH

-        "CMake package configuration installation directory for the SystemCLanguage package.")

--  set (SystemCTLM_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCTLM CACHE PATH

-+  set (SystemCTLM_INSTALL_CMAKEDIR share/SystemCTLM CACHE PATH

-        "CMake package configuration installation directory for the SystemCTLM package.")

- endif (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR)

- mark_as_advanced(SystemCLanguage_INSTALL_CMAKEDIR SystemCTLM_INSTALL_CMAKEDIR)

+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b7815ae..86d79d1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -555,7 +555,7 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ 
+ # Set the installation paths for headers, libraries, and documentation.
+-set (CMAKE_INSTALL_DOCDIR "share/doc/systemc" CACHE PATH
++set (CMAKE_INSTALL_DOCDIR "share/systemc/doc" CACHE PATH
+      "Documentation installation directory") # otherwise mixed-case
+ if (INSTALL_TO_LIB_BUILD_TYPE_DIR)
+   # Install libraries to lib-${CMAKE_BUILD_TYPE} so that different build variants
+@@ -584,14 +584,14 @@ if (INSTALL_LIB_TARGET_ARCH_SYMLINK AND CMAKE_HOST_UNIX)
+ endif (INSTALL_LIB_TARGET_ARCH_SYMLINK AND CMAKE_HOST_UNIX)
+ 
+ if (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR)
+-  set (SystemCLanguage_INSTALL_CMAKEDIR share/cmake/SystemCLanguage CACHE PATH
++  set (SystemCLanguage_INSTALL_CMAKEDIR lib/cmake/SystemCLanguage CACHE PATH
+        "CMake package configuration installation directory" FORCE)
+   set (SystemCTLM_INSTALL_CMAKEDIR share/cmake/SystemCTLM CACHE PATH
+        "CMake package configuration installation directory" FORCE)
+ else (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR)
+-  set (SystemCLanguage_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCLanguage CACHE PATH
++  set (SystemCLanguage_INSTALL_CMAKEDIR lib/cmake/SystemCLanguage CACHE PATH
+        "CMake package configuration installation directory for the SystemCLanguage package.")
+-  set (SystemCTLM_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/SystemCTLM CACHE PATH
++  set (SystemCTLM_INSTALL_CMAKEDIR share/cmake/SystemCTLM CACHE PATH
+        "CMake package configuration installation directory for the SystemCTLM package.")
+ endif (INSTALL_TO_LIB_BUILD_TYPE_DIR OR INSTALL_TO_LIB_TARGET_ARCH_DIR)
+ mark_as_advanced(SystemCLanguage_INSTALL_CMAKEDIR SystemCTLM_INSTALL_CMAKEDIR)
diff --git a/ports/systemc/portfile.cmake b/ports/systemc/portfile.cmake
index 0165b8270..8ecb7e8fb 100644
--- a/ports/systemc/portfile.cmake
+++ b/ports/systemc/portfile.cmake
@@ -26,16 +26,11 @@ vcpkg_configure_cmake(
 )

 

 vcpkg_install_cmake()

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SystemCLanguage TARGET_PATH share/systemclanguage)

+vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/SystemCTLM TARGET_PATH share/systemctlm)

 

-vcpkg_fixup_cmake_targets(CONFIG_PATH share/SystemCLanguage TARGET_PATH share/SystemCLanguage)

-vcpkg_fixup_cmake_targets(CONFIG_PATH share/SystemCTLM TARGET_PATH share/SystemCTLM)

-

-# Handle copyright

-file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/systemc RENAME copyright)

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/sysc/packages/qt/time)

 

-# Post-build test for cmake libraries (disabled for now due to issues with vcpkg_test_cmake)

-#vcpkg_test_cmake(PACKAGE_NAME SystemCLanguage)

-#vcpkg_test_cmake(PACKAGE_NAME SystemCTLM)

+file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/systemc RENAME copyright)