songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the verinfo of CGAL DLLs, on Windows 

And fix the test files.
This commit is contained in:
Laurent Rineau 2019-04-03 14:15:00 +02:00
parent 85047bcb61
commit 5a67ea92fc
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/src/CGAL_libs_verinfo.rc.in
View File

@ -25,7 +25,7 @@
#define CGAL_VER_str(s) CGAL_VER_xstr(s)
#define CGAL_VER_VERSION CGAL_VERSION_MAJOR,CGAL_VERSION_MINOR,CGAL_VERSION_PATCH,CGAL_VERSION_BUILD
#define CGAL_VER_VERSION_STR CGAL_VER_str(CGAL_VERSION)
#define CGAL_VER_VERSION_STR CGAL_VER_str(CGAL_VERSION_MAJOR) "." CGAL_VER_str(CGAL_VERSION_MINOR) "." CGAL_VER_str(CGAL_VERSION_PATCH) "." CGAL_VER_str(CGAL_VERSION_BUILD)
#define CGAL_VER_COMPANYNAME_STR "The CGAL Project, https://www.cgal.org/\0"
#define CGAL_VER_FILEDESCRIPTION_STR "@LIBRARY_NAME@ Library\0"
#define CGAL_VER_FILEVERSION_STR CGAL_VER_VERSION_STR

9
Installation/test/Installation/CMakeLists.txt
View File

@ -79,10 +79,13 @@ if ( CGAL_FOUND )
endif()
endif()
if(WIN32)
if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL Windows)
add_executable(display_dll_version_info display_dll_version_info.cpp)
target_link_libraries(display_dll_version_info version)
add_executable(test_gmp_mpfr_dll test_gmp_mpfr_dll.cpp)
target_link_libraries(test_gmp_mpfr_dll Version)
endif(WIN32)
target_link_libraries(test_gmp_mpfr_dll version)
CGAL_add_test(test_gmp_mpfr_dll)
endif()
find_package( LEDA QUIET)
if(LEDA_FOUND)

2
Installation/test/Installation/display_dll_version_info.cpp
View File

@ -49,7 +49,7 @@ int main(int argc, char** argv) {
} else {
std::cerr << "Usage:\n"
<< " display_dll_version_info /path/to/a.dll\n";
return 0;
}
return 0;
}
#endif