2023-10-13 01:58:46 +08:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index 12ea06c..6c33c25 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -156,10 +156,5 @@ install (FILES
|
|
|
|
|
|
|
|
|
|
################# compile tests ################
|
|
|
|
|
|
|
|
|
|
-ADD_SUBDIRECTORY( lib/googletest )
|
|
|
|
|
-
|
|
|
|
|
-if(COMPILER_SUPPORTS_CXX11)
|
|
|
|
|
- ADD_SUBDIRECTORY( tests )
|
|
|
|
|
-endif()
|
|
|
|
|
|
|
|
|
|
ENDIF()
|
2021-05-08 05:21:09 +08:00
|
|
|
diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake
|
2023-10-13 01:58:46 +08:00
|
|
|
index 2969533..e70c4b7 100644
|
2021-05-08 05:21:09 +08:00
|
|
|
--- a/cmake/Modules/DefineInstallationPaths.cmake
|
|
|
|
|
+++ b/cmake/Modules/DefineInstallationPaths.cmake
|
2023-10-13 01:58:46 +08:00
|
|
|
@@ -127,7 +127,7 @@ if (UNIX OR MINGW OR WIN32)
|
|
|
|
|
set (PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" CACHE PATH "pkgconfig dir" FORCE)
|
|
|
|
|
endif ()
|
2021-05-08 05:21:09 +08:00
|
|
|
|
2023-10-13 01:58:46 +08:00
|
|
|
-if (MSCV)
|
2021-05-08 05:21:09 +08:00
|
|
|
+if (0)
|
|
|
|
|
# Same same
|
|
|
|
|
SET(BIN_INSTALL_DIR .)
|
|
|
|
|
SET(SBIN_INSTALL_DIR .)
|
2023-10-13 01:58:46 +08:00
|
|
|
@@ -137,5 +137,5 @@ if (MSCV)
|
2021-05-08 05:21:09 +08:00
|
|
|
SET(ICON_INSTALL_DIR .)
|
|
|
|
|
SET(SOUND_INSTALL_DIR .)
|
|
|
|
|
SET(LOCALE_INSTALL_DIR lang)
|
2023-10-13 01:58:46 +08:00
|
|
|
-endif (MSCV)
|
|
|
|
|
+endif ()
|
2021-05-08 05:21:09 +08:00
|
|
|
|
