Skip to content

Commit

Permalink
Merge branch 'master' of \\192.168.1.155\git\public
Browse files Browse the repository at this point in the history
  • Loading branch information
@captainys
captainys committed Dec 9, 2024
2 parents 4b15e48 + 51242d6 commit 90dcc5b
Show file tree
Hide file tree
Showing 52 changed files with 91 additions and 318 deletions.
8 changes: 2 additions & 6 deletions src/fsgui3d/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsgui3d/src/gl1/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsgui3d/src/gl2/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsgui3d/template-easy/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,8 @@ set(REALLY_NEED_CPP11 0) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsgui3d/template/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@ endif()
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsgui3d/template_with_filedialog/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,8 @@ set(REALLY_NEED_CPP11 0) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsguilib/filedialog/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsguilib/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsguilib/src/gl1/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsguilib/src/gl2/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsguilib/src/nownd/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsguilib/template/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@ endif()
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fsguilib/template_with_filedialog/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,8 @@ set(REALLY_NEED_CPP11 0) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fslazywindow/samples/sample00-bouncingBall/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,8 @@ endif()
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fslazywindow/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fslazywindow/template/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,8 @@ endif()
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fssimplefiledialog/sample/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/fssimplefiledialog/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,8 @@ set(DATA_FILE_LOCATION)
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/opencv/arucoMarkerDetection/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/opencv/drawMarker/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,8 @@ set(DATA_FILE_LOCATION)
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/opencv/videoCapture/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,8 @@ endif()
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 0 additions & 8 deletions src/ysclass/src/CMakeFiles
View file

This file was deleted.

8 changes: 2 additions & 6 deletions src/ysclass/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,8 @@ set(REALLY_NEED_CPP11 0) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/ysclass11/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,8 @@ set(REALLY_NEED_CPP11 1) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
1 change: 1 addition & 0 deletions src/ysclass11/src/ysthreadpool.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//////////////////////////////////////////////////////////// */

#include <stdio.h>
#include "ysthreadpool.h"


Expand Down
8 changes: 2 additions & 6 deletions src/ysfontrenderer/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,8 @@ set(REALLY_NEED_CPP11 0) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
8 changes: 2 additions & 6 deletions src/ysgebl/src/cmdlib/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,8 @@ set(REALLY_NEED_CPP11 0) # Setting 1 will enable use of C++11 libraries, but
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

cmake_minimum_required(VERSION 3.0.0)
if("${CMAKE_CURRENT_SOURCE_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}" AND
"${CMAKE_BINARY_DIR}" MATCHES "^${CMAKE_SOURCE_DIR}")
message(FATAL_ERROR "In-source build prohibited.\nClear cache and Start cmake from somewhere else.")
# First condition is to allow inclusion of the project from outside CMake project with
# explicit binary-directory specification. eg. add_subdirectory from Android CMakeLists.txt
endif()



if(MSVC)
if(NOT WIN_SUBSYSTEM)
Expand Down
Loading

0 comments on commit 90dcc5b

Please sign in to comment.