From 6c9f6cf0846c0fcb4374f133adbd3ae67c81811e Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Wed, 8 Apr 2020 08:42:59 +0200 Subject: [PATCH] Revert "CMake: Don't create symlinks on unsupporting file systems (#539)" As noted in #539, the symlink check was to support compiling raylib on VirtualBox vboxfs as no symlinks are supported there. With me using Linux as daily driver outside VirtualBox now, this 'feature' is most likely unused by anyone, but still annoys other users (#791). Just revert it and be done with it. If there are really others building raylib on vboxfs or a similarly crippled file system under Linux, they should now step forward when their build breaks. This reverts commit b8ca51fd01a68b9b6040f8c3c631eedefd7d7735. --- .gitignore | 1 - CMakeLists.txt | 2 -- cmake/CheckFileSystemSymlinkSupport.cmake | 14 -------------- src/CMakeLists.txt | 10 ++-------- 4 files changed, 2 insertions(+), 25 deletions(-) mode change 100644 => 100755 CMakeLists.txt delete mode 100644 cmake/CheckFileSystemSymlinkSupport.cmake diff --git a/.gitignore b/.gitignore index 1fb70e8b..4459c9e5 100644 --- a/.gitignore +++ b/.gitignore @@ -104,7 +104,6 @@ CMakeCache.txt CMakeFiles CMakeScripts Testing -TestingIfSymlinkWorks cmake_install.cmake install_manifest.txt compile_commands.json diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100644 new mode 100755 index be74c4da..bbac563c --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,8 +22,6 @@ add_if_flag_compiles(-Werror=implicit-function-declaration CMAKE_C_FLAGS) # src/external/jar_xm.h does shady stuff add_if_flag_compiles(-fno-strict-aliasing CMAKE_C_FLAGS) -include(CheckFileSystemSymlinkSupport) - if (ENABLE_ASAN) add_if_flag_compiles(-fno-omit-frame-pointer CMAKE_C_FLAGS CMAKE_LINKER_FLAGS) add_if_flag_compiles(-fsanitize=address CMAKE_C_FLAGS CMAKE_LINKER_FLAGS) diff --git a/cmake/CheckFileSystemSymlinkSupport.cmake b/cmake/CheckFileSystemSymlinkSupport.cmake deleted file mode 100644 index 8eb508cb..00000000 --- a/cmake/CheckFileSystemSymlinkSupport.cmake +++ /dev/null @@ -1,14 +0,0 @@ -# Populates a ${FILESYSTEM_LACKS_SYMLINKS} variable -message(STATUS "Testing if file system supports symlinks") -execute_process( - COMMAND ${CMAKE_COMMAND} -E create_symlink CMakeLists.txt "${CMAKE_CURRENT_BINARY_DIR}/TestingIfSymlinkWorks" - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - RESULT_VARIABLE FILESYSTEM_LACKS_SYMLINKS - ERROR_QUIET -) -If (FILESYSTEM_LACKS_SYMLINKS) - message(STATUS "Testing if file system supports symlinks -- unsupported") -else() - message(STATUS "Testing if file system supports symlinks -- supported") -endif() - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2cee1b6b..aba877e7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -208,16 +208,10 @@ if(SHARED) if (${PLATFORM} MATCHES "Desktop") target_link_libraries(raylib glfw) endif() - if (UNIX AND ${FILESYSTEM_LACKS_SYMLINKS}) - MESSAGE(WARNING "Can't version UNIX shared library on file system without symlink support") - else() - set_target_properties(raylib PROPERTIES - VERSION ${PROJECT_VERSION} - SOVERSION ${API_VERSION} - ) - endif() set_target_properties(raylib PROPERTIES PUBLIC_HEADER "raylib.h" + VERSION ${PROJECT_VERSION} + SOVERSION ${API_VERSION} ) if (WIN32)