From e12a35a609f9b17720442728ea8f76c16b962d48 Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Sun, 22 Jul 2018 18:33:45 -0700 Subject: [PATCH] update config --- CMakeLists.txt | 22 ---------------------- texthook/CMakeLists.txt | 19 +------------------ vnrhook/CMakeLists.txt | 28 ++-------------------------- 3 files changed, 3 insertions(+), 66 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 13d1736..eac5ce9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,35 +4,14 @@ set(CMAKE_CONFIGURATION_TYPES Debug Release) project(NextHooker) -set(CMAKE_INSTALL_PREFIX "" CACHE FILEPATH "installation path") - -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug") -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release") -set(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION ON) - -execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE FULLDATE) -# set(DATE "07/13/2018") -string(SUBSTRING ${FULLDATE} 4 10 BUILD_DATE) -set(BUILD_DATE ${BUILD_DATE}) - -set(CPACK_GENERATOR "ZIP") -set(CPACK_PACKAGE_VERSION_MAJOR 1) -set(CPACK_PACKAGE_VERSION_MINOR 0) -set(CPACK_PACKAGE_VERSION_PATCH 4) -set(CPACK_SOURCE_GENERATOR "ZIP") -set(CPACK_SOURCE_IGNORE_FILES "/CVS/;/\\\\.svn/;/\\\\.bzr/;/\\\\.hg/;/\\\\.git/;\\\\.swp$;\\\\.#;/#" ".*\\\\.user$" "\\\\.gitignore$" "\\\\.gitmodules$" "\\\\.git$") -include(CPack) - add_compile_options( #/Zc:auto # config.pri /wd4819 # config.pri /MP /GS- - $<$:/MT> - #$<$:/MTd> ) add_definitions( @@ -52,4 +31,3 @@ include_directories( add_subdirectory(texthook) add_subdirectory(vnrhook) -# add_subdirectory(profile) diff --git a/texthook/CMakeLists.txt b/texthook/CMakeLists.txt index aab5750..5a51e0b 100644 --- a/texthook/CMakeLists.txt +++ b/texthook/CMakeLists.txt @@ -1,11 +1,3 @@ -# texthook.pro -# CONFIG += noqtgui dll #eha # eha will catch all exceptions, but does not work on Windows XP - -# DEFINES += ITH_HAS_CRT # Use native CRT - -# # TODO: Get rid of dependence on msvc's swprintf -# DEFINES += _CRT_NON_CONFORMING_SWPRINTFS - project(host) set(vnrhost_src @@ -26,21 +18,12 @@ set_target_properties(vnrhost PROPERTIES LINK_FLAGS /SUBSYSTEM:WINDOWS) target_compile_options(vnrhost PRIVATE # /GR- - $<$:/MT> + $<$:/MT> $<$:> ) -#STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - -target_link_libraries(vnrhost) - target_compile_definitions(vnrhost PRIVATE ITH_HAS_CRT _CRT_NON_CONFORMING_SWPRINTFS ) - -install(TARGETS vnrhost RUNTIME - DESTINATION . - CONFIGURATIONS Release -) diff --git a/vnrhook/CMakeLists.txt b/vnrhook/CMakeLists.txt index 365a7ad..e2a9c5c 100644 --- a/vnrhook/CMakeLists.txt +++ b/vnrhook/CMakeLists.txt @@ -1,22 +1,3 @@ -# # hook.pro -# # Exception handler to catch all exceptions -# CONFIG += dll noqt eh eha # noeh nosafeseh - -# DEFINES += ITH_HAS_CRT ITH_HAS_SEH -# DEFINES += MEMDBG_NO_STL NTINSPECT_NO_STL # disabled as not used - -# # jichi 11/13/2011: disable swprinf warning -# DEFINES += _CRT_NON_CONFORMING_SWPRINTFS - -# config.pri -# CONFIG(eha) { -# message(CONFIG eha) -# QMAKE_CXXFLAGS_STL_ON -= /EHsc -# QMAKE_CXXFLAGS_EXCEPTIONS_ON -= /EHsc -# QMAKE_CXXFLAGS_STL_ON += /EHa -# QMAKE_CXXFLAGS_EXCEPTIONS_ON += /EHa -# } - project(engine) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -72,7 +53,7 @@ set_target_properties(vnrhook PROPERTIES target_compile_options(vnrhook PRIVATE /EHa - $<$:/MT> + $<$:/MT> $<$:> ) @@ -88,9 +69,4 @@ target_compile_definitions(vnrhook ITH_HAS_CRT ITH_HAS_SEH _CRT_NON_CONFORMING_SWPRINTFS -) - -install(TARGETS vnrhook RUNTIME - DESTINATION . - CONFIGURATIONS Release -) +) \ No newline at end of file