cmake work, includes 2x speedup for windows build (#349)

* speedup windows build

simplify heclib

* cmake:, make source of heclib private

* drop powf_wrap.c  (Centos/RHEL 7)

Author: ktarbet

CMakeLists.txt

@@ -11,7 +11,7 @@ add_subdirectory(heclib)
 
 find_package(Git QUIET)
 if(DSS_TEST_DATA_DIR)
-    option(RUN_TESTS "Run Tests, requires initializing a git submodule." ON)
+    option(RUN_TESTS "Run Tests, requires dss-test-data git repo." ON)
     if(RUN_TESTS)
         enable_testing()
         add_subdirectory(test)

heclib/CMakeLists.txt

@@ -1,16 +1,4 @@
 
 add_subdirectory(heclib_c)
-
-add_library(heclib STATIC $<TARGET_OBJECTS:heclib_c>)
-
-
-if(MSVC)
-    target_link_libraries(heclib PRIVATE zlibstatic)
-else()
-    target_link_libraries(heclib PRIVATE ZLIB::ZLIBSTATIC)
-endif()
-
-target_include_directories(heclib PUBLIC ${CMAKE_CURRENT_LIST_DIR}/heclib_c/src/headers)
-
 add_subdirectory(hecdss)
 add_subdirectory(javaHeclib)

heclib/hecdss/Makefile

@@ -8,7 +8,7 @@ ifeq ($(UNAME_S),Linux)
 	ifeq ($(UNAME_M),aarch64)
 		LDFLAGS1=-Wl,-z,defs
 	else
-		LDFLAGS1=-Wl,-z,defs,--wrap=powf
+		LDFLAGS1=-Wl,-z,defs
 		BITS=-m64
 	endif
 	CFLAGS=$(BITS) -fPIC -g -std=gnu99 $(CWARNING) $(INC_DIRS) -D__linux__

heclib/heclib_c/CMakeLists.txt

@@ -1,17 +1,25 @@
-
-add_library(heclib_c OBJECT ${C_SRC})
+add_library(heclib STATIC)
 
 if( ${CMAKE_C_COMPILER_ID} MATCHES GNU)    
-    target_compile_options(heclib_c PRIVATE -fPIC -std=gnu99)
+    target_compile_options(heclib PRIVATE -fPIC -std=gnu99)
 elseif(${CMAKE_C_COMPILER_ID} MATCHES SunPro)
-    target_compiler_options(heclib_c PRIVATE -m64 -xmemalign=2i -xcode=pic32 -c -Isrc/headers -mt -xcode=abs64 -xstrconst -xc99=all -xCC -g -xs)
+    target_compile_options(heclib PRIVATE -m64 -xmemalign=2i -xcode=pic32 -c -Isrc/headers -mt -xcode=abs64 -xstrconst -xc99=all -xCC -g -xs)
+elsif(MSVC)
+    target_compile_options(heclib PRIVATE /Wall /MP)
 else()
     message(STATUS "generic options")
 endif()
-target_include_directories(heclib_c PUBLIC src/headers)
-target_link_libraries(heclib_c PRIVATE ZLIB::ZLIBSTATIC)
-# Keep all logic above this like, only include source references here (including headers)
-target_sources(heclib_c PUBLIC # most of this should really be private but for the sake of initial simplicity don't worry about it.
+
+
+target_include_directories(heclib PUBLIC src/headers)
+
+if(MSVC)
+    target_link_libraries(heclib PUBLIC zlibstatic)
+else()
+    target_link_libraries(heclib PUBLIC ZLIB::ZLIBSTATIC)
+endif()
+
+target_sources(heclib PRIVATE 
 src/Internal/ztsIncrementBlock.c
 src/Internal/zhash.c
 src/Internal/zpdUnitsToHead.c
@@ -53,7 +61,6 @@ src/Internal/ztsIrregStoreBlock.c
 src/Internal/ztsRegRepeatCompress.c
 src/Internal/zreadInfo.c
 src/Internal/zinitIfltab.c
-src/Internal/powf_wrap.c
 src/Internal/zcatParsePath.c
 src/Internal/ztsGetSizesInternal.c
 src/Internal/zcheckInternal.c

heclib/heclib_c/heclib_c.vcxproj

@@ -40,7 +40,6 @@
     <ClCompile Include="src\Internal\charInt.c" />
     <ClCompile Include="src\Internal\charLong.c" />
     <ClCompile Include="src\Internal\isTsPattern.c" />
-    <ClCompile Include="src\Internal\powf_wrap.c" />
     <ClCompile Include="src\Internal\zbinNew.c" />
     <ClCompile Include="src\Internal\zbinUpdate.c" />
     <ClCompile Include="src\Internal\zcatalogInternal.c" />

heclib/heclib_c/heclib_c.vcxproj.filters

@@ -345,9 +345,6 @@
     <ClCompile Include="src\Internal\charLong.c">
       <Filter>src\Internal</Filter>
     </ClCompile>
-    <ClCompile Include="src\Internal\powf_wrap.c">
-      <Filter>src\Internal</Filter>
-    </ClCompile>
     <ClCompile Include="src\Internal\zbinNew.c">
       <Filter>src\Internal</Filter>
     </ClCompile>

heclib/heclib_c/src/Internal/powf_wrap.c

@@ -6,7 +6,9 @@ if(JNI_FOUND)
     if( ${CMAKE_C_COMPILER_ID} MATCHES GNU)    
         target_compile_options(javaHeclib PRIVATE -fPIC -std=gnu99)
     elseif(${CMAKE_C_COMPILER_ID} MATCHES SunPro)
-        target_compiler_options(javaHecib PRIVATE -m64 -xmemalign=2i -xcode=pic32 -c -Isrc/headers -mt -xcode=abs64 -xstrconst -xc99=all -xCC -g -xs)
+        target_compile_options(javaHeclib PRIVATE -m64 -xmemalign=2i -xcode=pic32 -c -Isrc/headers -mt -xcode=abs64 -xstrconst -xc99=all -xCC -g -xs)
+    elsif(MSVC)
+        target_compile_options(heclib PRIVATE /Wall /MP)
     else()
         message(STATUS "generic options")
     endif()

heclib/javaHeclib/CMakeLists.txt

@@ -4,7 +4,7 @@ UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
 	FDEBUG=-fcheck=all,no-recursion
 	CFLAGS=-fPIC -g -std=gnu99 -Werror $(INC_DIRS) -D__linux__ -fcommon
-	LDFLAGS=-Wl,-z,defs,--wrap=powf -lz -lrt -lgfortran -lm
+	LDFLAGS=-Wl,-z,defs -lz -lrt -lgfortran -lm
 endif
 ifeq ($(UNAME_S),SunOS)
 	CC=cc