Unverified Commit 38fe9cac authored by Wuttke, Joachim's avatar Wuttke, Joachim Committed by GitHub
Browse files

Merge pull request #228 from jwuttke/master

Master
parents c9582bff 9ff01a4a
......@@ -7,6 +7,7 @@ include(PreventInSourceBuilds)
option(CERF_CPP "Build libcerf as native C++" OFF)
option(LIB_MAN "Build libcerf man pages" ON)
option(LIB_INSTALL "Install libcerf" ON)
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
if (${CERF_CPP})
project(cerfcpp CXX)
......
......@@ -13,7 +13,7 @@ if (${CERF_CPP})
set_property(SOURCE ${src_files} PROPERTY LANGUAGE CXX)
endif()
add_library(${lib} ${LIB_SHARED} ${src_files})
add_library(${lib} ${src_files})
set_target_properties(
${lib} PROPERTIES
......
......@@ -15,6 +15,7 @@ set(lmfit_VERSION ${lmfit_SOVERSION}.0) # lib version
option(FITTEST "Build with FitTest" OFF)
option(LIB_MAN "Build library man pages" ON)
option(LIB_INSTALL "Install library" ON)
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
set(destination ${CMAKE_INSTALL_PREFIX})
......
......@@ -5,7 +5,7 @@ set(${lib}_LIBRARY_TYPE SHARED)
set(src_files lmcurve.c lmmin.c lminvert.c)
set(inc_files lmcurve.h lmmin.h lminvert.h lmstruct.h)
add_library(${lib} ${LIB_SHARED} ${src_files})
add_library(${lib} ${src_files})
set_target_properties(
${lib} PROPERTIES
......
......@@ -29,8 +29,8 @@ if(MSVC)
set(MS_NOWARN "/wd4267 /wd4305 /wd4244 /wd4068 /wd4996 /wd4101 /wd4715")
set(MS_D "-D_CRT_SECURE_NO_WARNINGS -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} ${MS_NOWARN} ${MS_D}")
set(LIB_SHARED "" CACHE INTERNAL "" FORCE)
set(CMAKE_EXE_LINKER_FLAGS "-static")
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
else()
# -fsanitize=address -fsanitize=undefined
set(DEB_FLAGS "-Wall -Wno-sign-compare -fno-omit-frame-pointer")
......
set QTDIR=C:\Qt\5.10.1\msvc2017_64
set PATH=C:\Qt\5.10.1\msvc2017_64\bin;%PATH%
cmake -G "Visual Studio 15 2017" -A x64 -T host=x64 ..\Steca-juanmcloaiza -DBUILD_SHARED_LIBS=OFF
cmake --build . --config Release
\ No newline at end of file
set QTDIR=C:\Qt5\5.11.2\msvc2017_64
set PATH=C:\Qt5\5.11.2\msvc2017_64\lib;C:\yaml.win64\local_x64;%PATH%
set Qt5Core_DIR=C:\Qt5\5.11.2\msvc2017_64\lib\cmake
set Qt5Gui_DIR=C:\Qt5\5.11.2\msvc2017_64\lib\cmake
set Qt5Widgets_DIR=C:\Qt5\5.11.2\msvc2017_64\lib\cmake
set Qt5Network_DIR=C:\Qt5\5.11.2\msvc2017_64\lib\cmake
cmake -G "Visual Studio 15 2017" -A x64 -T host=x64 .. -DBUILD_SHARED_LIBS=OFF
cmake --build . --config Release
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment