|
@@ -455,6 +455,7 @@ set(RVC_BASE_PATH "${PACK_INSTALL_PREFIX_VERSION}")
|
|
|
set(RVC_INCLUDE_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/include")
|
|
|
set(RVC_LIBRARY_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/lib")
|
|
|
set(RVC_RUNTIME_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/bin")
|
|
|
+set(RVC_PDBSAVE_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/pdb")
|
|
|
set(RVC_PLUGINS_PATH "${RVC_RUNTIME_PATH}/plugins")
|
|
|
set(RVC_MODULE_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/mod")
|
|
|
set(RVC_CONFIG_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/cfg")
|
|
@@ -463,7 +464,6 @@ set(RVC_SHARED_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/share")
|
|
|
set(RVC_RESOURCE_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/res")
|
|
|
#win
|
|
|
set(RVC_CHROMIUM_PATH "${RVC_RUNTIME_PATH}/Chromium")
|
|
|
-
|
|
|
set(CMAKE_INSTALL_INCLUDEDIR ${RVC_INCLUDE_PATH})
|
|
|
set(CMAKE_INSTALL_BINDIR ${RVC_RUNTIME_PATH})
|
|
|
if(MSVC)
|
|
@@ -504,15 +504,20 @@ if(WIN32)
|
|
|
endif(WIN32)
|
|
|
|
|
|
if(MSVC)
|
|
|
- # Force to always compile with W4
|
|
|
- if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
|
|
- string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
|
|
- else()
|
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
|
|
|
- endif()
|
|
|
+ # Force to always compile with W4
|
|
|
+ if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
|
|
|
+ string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
|
|
+ else()
|
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
|
|
|
+ endif()
|
|
|
+
|
|
|
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
|
|
|
+ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
|
|
|
+ set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
|
|
|
+
|
|
|
elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
|
|
- # Update if necessary
|
|
|
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
|
|
|
+ # Update if necessary
|
|
|
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
|
|
|
endif()
|
|
|
message(STATUS "definition content: CMAKE_C_FLAGS:${CMAKE_C_FLAGS}; CMAKE_CXX_FLAGS:${CMAKE_CXX_FLAGS}")
|
|
|
# Include files
|
|
@@ -568,11 +573,13 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.in" ${CMAKE_BINARY_DIR}/Ch
|
|
|
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
|
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
|
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
|
|
-set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
|
|
+#Output directory for MS debug symbol .pdb files generated by the linker for executable and shared library targets.
|
|
|
+#This variable is used to initialize the PDB_OUTPUT_DIRECTORY property on all the targets. See that target property for additional information.
|
|
|
+set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pdb)
|
|
|
if(WIN32)
|
|
|
- set(RVC_PDB_BINARY_DIR "${CMAKE_BINARY_DIR}/bin/${CMAKE_CONFIGURATION_TYPES}")
|
|
|
+ set(RVC_PDB_BINARY_DIR "${CMAKE_PDB_OUTPUT_DIRECTORY}/${CMAKE_CONFIGURATION_TYPES}")
|
|
|
else()
|
|
|
- set(RVC_PDB_BINARY_DIR ${CMAKE_BINARY_DIR}/bin)
|
|
|
+ set(RVC_PDB_BINARY_DIR ${CMAKE_PDB_OUTPUT_DIRECTORY})
|
|
|
endif(WIN32)
|
|
|
message(STATUS "RVC_PDB_BINARY_DIR: ${RVC_PDB_BINARY_DIR}")
|
|
|
|
|
@@ -699,7 +706,6 @@ if(DEVOPS_ON)
|
|
|
endif(DEVOPS_ON_CMAKE_PRD)
|
|
|
endif(DEVOPS_ON)
|
|
|
|
|
|
-
|
|
|
if(MSVC)
|
|
|
configure_file("${CMAKE_SOURCE_DIR}/addin/packaging/WIN/installbat.in" "${CMAKE_BINARY_DIR}/install.bat" @ONLY NEWLINE_STYLE CRLF)
|
|
|
install(PROGRAMS "${CMAKE_BINARY_DIR}/install.bat" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
|
|
@@ -826,6 +832,17 @@ if(CONAN_RES_DIRS_VENDORFILE)
|
|
|
install(DIRECTORY "${CONAN_RES_DIRS_VENDORFILE}" DESTINATION "${PACK_INSTALL_MISCS_DIR}" COMPONENT resources)
|
|
|
endif(CONAN_RES_DIRS_VENDORFILE)
|
|
|
|
|
|
+#pdb save
|
|
|
+if(WITH_PDB_SAVEV2)
|
|
|
+ message(STATUS "config pdb save scripts.")
|
|
|
+ string(TIMESTAMP PDBSAVE_TIME %Y%m%d_%H%M%S)
|
|
|
+ set(PDB_ZIP_FILE_NAME "savepdbVS2019_${RVC_VERSION}_${PDBSAVE_TIME}.7z")
|
|
|
+ install(CODE "MESSAGE(\"----Pack PDB file ${PDB_ZIP_FILE_NAME}----\")" COMPONENT symbols)
|
|
|
+ install(CODE "execute_process(COMMAND 7z a ${PDB_ZIP_FILE_NAME} ${RVC_PDB_BINARY_DIR}/* WORKING_DIRECTORY ${CMAKE_BINARY_DIR})" COMPONENT symbols)
|
|
|
+ install(CODE "execute_process(COMMAND curl -T ${PDB_ZIP_FILE_NAME} ftp://99.12.43.134:3721 -u savefile:12345678 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})" COMPONENT symbols)
|
|
|
+ install(CODE "MESSAGE(\"----Pack PDB File Done----\")" COMPONENT symbols)
|
|
|
+endif(WITH_PDB_SAVEV2)
|
|
|
+
|
|
|
#appoint the component to install , except header file here.
|
|
|
#set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
|
|
|
set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE TRUE)
|