Bladeren bron

improve cmake install/package

Andy Li 7 jaren geleden
bovenliggende
commit
39eef7d240

+ 25 - 5
CMakeLists.txt

@@ -94,10 +94,14 @@ add_library(libhl SHARED
     ${std_srcs}
 )
 
+set(public_headers
+    src/hl.h
+    src/hlc.h
+)
+
 set_target_properties(libhl
     PROPERTIES
-        PUBLIC_HEADER
-            "src/hl.h;src/hlc.h;src/hlc_main.c"
+    PUBLIC_HEADER "${public_headers}"
 )
 
 if(WIN32)
@@ -162,18 +166,34 @@ add_test(NAME hello.hl
 #####################
 # Packaging
 
+set(CPACK_OUTPUT_FILE_PREFIX ${OUTPUT_DIR})
+
 set(CPACK_PACKAGE_VENDOR "Haxe Foundation")
 set(CPACK_PACKAGE_VERSION_MAJOR ${HL_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${HL_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${HL_VERSION_PATCH})
-set(CPACK_GENERATOR ZIP)
+
+if (WIN32)
+	set(CPACK_GENERATOR "ZIP")
+else()
+	set(CPACK_GENERATOR "TGZ")
+endif()
+
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+
+set(HDLL_DESTINATION
+    ${CMAKE_INSTALL_LIBDIR}
+)
 
 install(
     TARGETS
         hl
         libhl
-    DESTINATION .
-    PUBLIC_HEADER DESTINATION include
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
 
 if (DEFINED ENV{APPVEYOR_REPO_COMMIT})

+ 1 - 1
libs/bullet/CMakeLists.txt

@@ -175,6 +175,6 @@ if(WIN32)
     install(
         TARGETS
             bullet.hdll
-        DESTINATION .
+        DESTINATION ${HDLL_DESTINATION}
     )
 endif()

+ 1 - 1
libs/directx/CMakeLists.txt

@@ -20,5 +20,5 @@ target_link_libraries(directx.hdll
 install(
 	TARGETS
 		directx.hdll
-	DESTINATION .
+	DESTINATION ${HDLL_DESTINATION}
 )

+ 1 - 1
libs/fmt/CMakeLists.txt

@@ -160,5 +160,5 @@ target_compile_definitions(fmt.hdll
 install(
     TARGETS
         fmt.hdll
-    DESTINATION .
+    DESTINATION ${HDLL_DESTINATION}
 )

+ 1 - 1
libs/openal/CMakeLists.txt

@@ -26,6 +26,6 @@ if(WIN32)
     install(
         TARGETS
             openal.hdll
-        DESTINATION .
+        DESTINATION ${HDLL_DESTINATION}
     )
 endif()

+ 1 - 1
libs/sdl/CMakeLists.txt

@@ -43,7 +43,7 @@ if (WITH_SDL2)
 
     install(
         TARGETS sdl.hdll
-        DESTINATION .
+        DESTINATION ${HDLL_DESTINATION}
     )
 
 endif()

+ 1 - 1
libs/sqlite/CMakeLists.txt

@@ -17,5 +17,5 @@ target_link_libraries(sqlite.hdll
 install(
     TARGETS
         sqlite.hdll
-    DESTINATION .
+    DESTINATION ${HDLL_DESTINATION}
 )

+ 1 - 1
libs/ssl/CMakeLists.txt

@@ -88,6 +88,6 @@ if(WIN32)
     install(
         TARGETS
             ssl.hdll
-        DESTINATION .
+        DESTINATION ${HDLL_DESTINATION}
     )
 endif()

+ 1 - 1
libs/ui/CMakeLists.txt

@@ -13,5 +13,5 @@ target_link_libraries(ui.hdll
 install(
     TARGETS
         ui.hdll
-    DESTINATION .
+    DESTINATION ${HDLL_DESTINATION}
 )

+ 1 - 1
libs/uv/CMakeLists.txt

@@ -68,5 +68,5 @@ endif()
 install(
     TARGETS
         uv.hdll
-    DESTINATION .
+    DESTINATION ${HDLL_DESTINATION}
 )

+ 1 - 1
libs/video/CMakeLists.txt

@@ -26,6 +26,6 @@ if(WIN32)
     install(
         TARGETS
             video.hdll
-        DESTINATION .
+        DESTINATION ${HDLL_DESTINATION}
     )
 endif()