updated to use cmake

Author: nlitsme

CMakeLists.txt

@@ -0,0 +1,54 @@
+cmake_minimum_required(VERSION 3.10)
+project(vdwreader)
+set(CMAKE_CXX_STANDARD 17)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    set(LINUX TRUE)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(DARWIN TRUE)
+elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+    set(FREEBSD TRUE)
+endif()
+
+# checking if we are called in the correct way:
+#  with a -B argument.  and without a cache file in the source directory.
+if (CMAKE_CACHEFILE_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
+    message(FATAL_ERROR "\nUnexpected CMakeCache.txt file in the source directory. Please remove it.")
+    return()
+endif()
+
+if (EXISTS ${CMAKE_BINARY_DIR}/CMakeLists.txt)
+    message(FATAL_ERROR "\nRun cmake with an explicit -B buildpath")
+    return()
+endif()
+
+if(MSVC)
+    # /MP = multithreaded build
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+    # /utf-8 = utf8 source and execution
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
+endif()
+
+if (WIN32)
+    add_definitions(-DNOMINMAX -DNOGDI)
+endif()
+
+add_library(itslib ../../itslib/src/stringutils.cpp)
+target_include_directories(itslib PUBLIC ../../itslib/include/itslib)
+target_compile_definitions(itslib PUBLIC _UNIX _NO_RAPI)
+
+#add_library(cpputils INTERFACE)
+#target_include_directories(cpputils INTERFACE ../../cpputils)
+
+
+find_package(OpenSSL REQUIRED)
+find_package(ZLIB REQUIRED)
+
+add_executable(vdwreader ${CMAKE_SOURCE_DIR}/vdwreader.cpp)
+target_link_libraries(vdwreader OpenSSL::Crypto)
+target_link_libraries(vdwreader ZLIB::ZLIB)
+target_link_libraries(vdwreader itslib)
+#target_link_libraries(vdwreader cpputils)
+
+

Makefile

@@ -1,35 +1,37 @@
 ITSLIB=$(HOME)/myprj/itslib
 all: vdwreader
 
-ifeq ($(D),)
-OPT=-O3
-else
-OPT=-O0
-endif
+cmake:
+	cmake -B build . $(if $(D),-DCMAKE_BUILD_TYPE=Debug,-DCMAKE_BUILD_TYPE=Release) $(CMAKEARGS)
+	$(MAKE) -C build $(if $(V),VERBOSE=1)
 
 clean:
 	$(RM) -r $(wildcard *.o) *.dSYM vdwreader
+	$(RM) -r build CMakeFiles CMakeCache.txt CMakeOutput.log
 
 vdwreader: vdwreader.o stringutils.o
 
-CXXFLAGS=-g -Wall -c $(OPT) -I $(ITSLIB)/include/itslib -D_UNIX -D_NO_RAPI -I /usr/local/opt/openssl/include -I . -std=c++17
+CFLAGS=-g -Wall $(if $(D),-O0,-O3)
+CFLAGS+=-I $(ITSLIB)/include/itslib
+CFLAGS+=-D_UNIX -D_NO_RAPI
+CFLAGS+=-I /usr/local/opt/openssl/include
+CFLAGS+=-I .
+
+CXXFLAGS=-std=c++17
 
 # include CDEFS from make commandline
-CXXFLAGS+=$(CDEFS) -MD
+CFLAGS+=$(CDEFS)
 
-LDFLAGS+=-g -Wall -L/usr/local/opt/openssl/lib -std=c++17 -lcrypto -lz
+LDFLAGS+=-g -Wall -L/usr/local/opt/openssl/lib -lcrypto -lz
 
 vpath .cpp $(ITSLIB)/src .
 
 %.o: $(ITSLIB)/src/%.cpp
-	$(CXX) $(CXXFLAGS) $^ -o $@ 
+	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $^ -o $@ 
 
 %.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(filter %.cpp,$^) -o $@ 
+	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(filter %.cpp,$^) -o $@ 
 
 %: %.o
 	$(CXX) $(LDFLAGS) $^ -o $@
 
-
-install:
-	cp ext2rd ~/bin/